diff --git a/appjar/.gitignore b/.gitignore similarity index 100% rename from appjar/.gitignore rename to .gitignore diff --git a/appjar/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from appjar/.settings/org.eclipse.core.resources.prefs rename to .settings/org.eclipse.core.resources.prefs diff --git a/appjar/.settings/org.eclipse.core.runtime.prefs b/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from appjar/.settings/org.eclipse.core.runtime.prefs rename to .settings/org.eclipse.core.runtime.prefs diff --git a/appjar/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from appjar/.settings/org.eclipse.jdt.core.prefs rename to .settings/org.eclipse.jdt.core.prefs diff --git a/appjar/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from appjar/.settings/org.eclipse.jdt.ui.prefs rename to .settings/org.eclipse.jdt.ui.prefs diff --git a/Documentation/dev-eclipse.txt b/Documentation/dev-eclipse.txt index 950d610833..c1e3abdf43 100644 --- a/Documentation/dev-eclipse.txt +++ b/Documentation/dev-eclipse.txt @@ -56,11 +56,11 @@ Ensure mina_sshd has been installed in your maven repository: Import Projects --------------- -Import appjar using General -> Maven Projects +Import pom.xml using General -> Maven Projects If you also want source projects for gwtorm, gwtjsonrpc or mina_sshd, import their top-level directories the same way. Note that you -may need to edit the pom.xmls under gerrit to ensure your snapshot +may need to edit the pom.xml under gerrit to ensure your snapshot builds are used. [NOTE] @@ -80,7 +80,7 @@ Configure Database You may have already done this step earlier, based on the instructions in link:dev-readme.html[Developer Setup]. -* Open gerrit-appjar/src/main/java +* Open gerrit-webapp/src/main/java * Copy `GerritServer.properties_example` to `GerritServer.properties` * Configure your database for debugging in hosted mode. diff --git a/Documentation/dev-readme.txt b/Documentation/dev-readme.txt index aa6b4baa01..ee7d0ff435 100644 --- a/Documentation/dev-readme.txt +++ b/Documentation/dev-readme.txt @@ -39,7 +39,7 @@ gwtorm supports (or add the necessary dialect support to gwtorm, and then configure your workspace anyway). ==== - cd appjar/src/main/java + cd src/main/java cp GerritServer.properties_example GerritServer.properties ==== @@ -100,13 +100,13 @@ Building From the command line: ==== - (cd appjar && mvn package) + mvn package ==== Output WAR will be placed in: ==== - appjar/target/gerrit-*.war + target/gerrit-*.war ==== diff --git a/Documentation/install.txt b/Documentation/install.txt index 0001223198..c89c0fcee3 100644 --- a/Documentation/install.txt +++ b/Documentation/install.txt @@ -36,8 +36,8 @@ Maven from a source download obtained directly from Git: (cd jgit/jgit-maven/jgit && mvn install) (cd mina_sshd && mvn install) - (cd appjar && mvn clean package) - cp appjar/target/gerrit-*.war ...YOUR.DEST.../gerrit.war + mvn clean package + cp target/gerrit-*.war ...YOUR.DEST.../gerrit.war ==== The first build may take a while as dependencies are searched diff --git a/gerrit1_import/1-to-2.sh b/gerrit1_import/1-to-2.sh index a8a19060a9..6eba78d876 100755 --- a/gerrit1_import/1-to-2.sh +++ b/gerrit1_import/1-to-2.sh @@ -25,10 +25,10 @@ user=gerrit2 if [ -z "$nobuild" ] then - (cd appjar && mvn package) || exit + mvn package || exit fi -out=appjar/target/gerrit-*.war +out=target/gerrit-*.war g2="java -jar $out" dropdb $dstdb diff --git a/appjar/gerrit_debug.launch b/gerrit_debug.launch similarity index 93% rename from appjar/gerrit_debug.launch rename to gerrit_debug.launch index 2f552e3c37..5e2a6529e3 100644 --- a/appjar/gerrit_debug.launch +++ b/gerrit_debug.launch @@ -2,26 +2,26 @@ - + - + - + - + - + - + diff --git a/appjar/gerrit_macos.launch b/gerrit_macos.launch similarity index 93% rename from appjar/gerrit_macos.launch rename to gerrit_macos.launch index 56ad5dc373..c8c83c8abd 100644 --- a/appjar/gerrit_macos.launch +++ b/gerrit_macos.launch @@ -2,27 +2,27 @@ - + - + - + - + - + - + diff --git a/appjar/pom.xml b/pom.xml similarity index 99% rename from appjar/pom.xml rename to pom.xml index cb2a72e1ab..372da0f68f 100644 --- a/appjar/pom.xml +++ b/pom.xml @@ -19,10 +19,10 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 gerrit - gerrit-appjar + gerrit-webapp war 2.0.1-SNAPSHOT - gerrit-appjar + gerrit-webapp Gerrit - Web Based Code Review http://android.git.kernel.org/?p=tools/gerrit.git diff --git a/appjar/src/main/java/GerritServer.properties_example b/src/main/java/GerritServer.properties_example similarity index 100% rename from appjar/src/main/java/GerritServer.properties_example rename to src/main/java/GerritServer.properties_example diff --git a/appjar/src/main/java/com/google/gerrit/Gerrit.gwt.xml b/src/main/java/com/google/gerrit/Gerrit.gwt.xml similarity index 100% rename from appjar/src/main/java/com/google/gerrit/Gerrit.gwt.xml rename to src/main/java/com/google/gerrit/Gerrit.gwt.xml diff --git a/appjar/src/main/java/com/google/gerrit/UserAgent.gwt.xml b/src/main/java/com/google/gerrit/UserAgent.gwt.xml similarity index 100% rename from appjar/src/main/java/com/google/gerrit/UserAgent.gwt.xml rename to src/main/java/com/google/gerrit/UserAgent.gwt.xml diff --git a/appjar/src/main/java/com/google/gerrit/client/ErrorDialog.java b/src/main/java/com/google/gerrit/client/ErrorDialog.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ErrorDialog.java rename to src/main/java/com/google/gerrit/client/ErrorDialog.java diff --git a/appjar/src/main/java/com/google/gerrit/client/FormatUtil.java b/src/main/java/com/google/gerrit/client/FormatUtil.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/FormatUtil.java rename to src/main/java/com/google/gerrit/client/FormatUtil.java diff --git a/appjar/src/main/java/com/google/gerrit/client/Gerrit.java b/src/main/java/com/google/gerrit/client/Gerrit.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/Gerrit.java rename to src/main/java/com/google/gerrit/client/Gerrit.java diff --git a/appjar/src/main/java/com/google/gerrit/client/GerritConstants.java b/src/main/java/com/google/gerrit/client/GerritConstants.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/GerritConstants.java rename to src/main/java/com/google/gerrit/client/GerritConstants.java diff --git a/appjar/src/main/java/com/google/gerrit/client/GerritConstants.properties b/src/main/java/com/google/gerrit/client/GerritConstants.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/GerritConstants.properties rename to src/main/java/com/google/gerrit/client/GerritConstants.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/GerritIcons.java b/src/main/java/com/google/gerrit/client/GerritIcons.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/GerritIcons.java rename to src/main/java/com/google/gerrit/client/GerritIcons.java diff --git a/appjar/src/main/java/com/google/gerrit/client/GerritMessages.java b/src/main/java/com/google/gerrit/client/GerritMessages.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/GerritMessages.java rename to src/main/java/com/google/gerrit/client/GerritMessages.java diff --git a/appjar/src/main/java/com/google/gerrit/client/GerritMessages.properties b/src/main/java/com/google/gerrit/client/GerritMessages.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/GerritMessages.properties rename to src/main/java/com/google/gerrit/client/GerritMessages.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/GerritVersion.java b/src/main/java/com/google/gerrit/client/GerritVersion.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/GerritVersion.java rename to src/main/java/com/google/gerrit/client/GerritVersion.java diff --git a/appjar/src/main/java/com/google/gerrit/client/Link.java b/src/main/java/com/google/gerrit/client/Link.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/Link.java rename to src/main/java/com/google/gerrit/client/Link.java diff --git a/appjar/src/main/java/com/google/gerrit/client/NotFoundScreen.java b/src/main/java/com/google/gerrit/client/NotFoundScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/NotFoundScreen.java rename to src/main/java/com/google/gerrit/client/NotFoundScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/RpcStatus.java b/src/main/java/com/google/gerrit/client/RpcStatus.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/RpcStatus.java rename to src/main/java/com/google/gerrit/client/RpcStatus.java diff --git a/appjar/src/main/java/com/google/gerrit/client/SignInDialog.java b/src/main/java/com/google/gerrit/client/SignInDialog.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/SignInDialog.java rename to src/main/java/com/google/gerrit/client/SignInDialog.java diff --git a/appjar/src/main/java/com/google/gerrit/client/SignedInListener.java b/src/main/java/com/google/gerrit/client/SignedInListener.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/SignedInListener.java rename to src/main/java/com/google/gerrit/client/SignedInListener.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AccountConstants.java b/src/main/java/com/google/gerrit/client/account/AccountConstants.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AccountConstants.java rename to src/main/java/com/google/gerrit/client/account/AccountConstants.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AccountConstants.properties b/src/main/java/com/google/gerrit/client/account/AccountConstants.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AccountConstants.properties rename to src/main/java/com/google/gerrit/client/account/AccountConstants.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AccountMessages.java b/src/main/java/com/google/gerrit/client/account/AccountMessages.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AccountMessages.java rename to src/main/java/com/google/gerrit/client/account/AccountMessages.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AccountMessages.properties b/src/main/java/com/google/gerrit/client/account/AccountMessages.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AccountMessages.properties rename to src/main/java/com/google/gerrit/client/account/AccountMessages.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java b/src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java rename to src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AccountSecurity.java b/src/main/java/com/google/gerrit/client/account/AccountSecurity.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AccountSecurity.java rename to src/main/java/com/google/gerrit/client/account/AccountSecurity.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AccountService.java b/src/main/java/com/google/gerrit/client/account/AccountService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AccountService.java rename to src/main/java/com/google/gerrit/client/account/AccountService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java b/src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java rename to src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AccountSettings.java b/src/main/java/com/google/gerrit/client/account/AccountSettings.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AccountSettings.java rename to src/main/java/com/google/gerrit/client/account/AccountSettings.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AgreementInfo.java b/src/main/java/com/google/gerrit/client/account/AgreementInfo.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AgreementInfo.java rename to src/main/java/com/google/gerrit/client/account/AgreementInfo.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/AgreementPanel.java b/src/main/java/com/google/gerrit/client/account/AgreementPanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/AgreementPanel.java rename to src/main/java/com/google/gerrit/client/account/AgreementPanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/ContactPanel.java b/src/main/java/com/google/gerrit/client/account/ContactPanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/ContactPanel.java rename to src/main/java/com/google/gerrit/client/account/ContactPanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java b/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java rename to src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/LoginService.java b/src/main/java/com/google/gerrit/client/account/LoginService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/LoginService.java rename to src/main/java/com/google/gerrit/client/account/LoginService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java b/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java rename to src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/PreferencePanel.java b/src/main/java/com/google/gerrit/client/account/PreferencePanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/PreferencePanel.java rename to src/main/java/com/google/gerrit/client/account/PreferencePanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java b/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java rename to src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/SignInResult.java b/src/main/java/com/google/gerrit/client/account/SignInResult.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/SignInResult.java rename to src/main/java/com/google/gerrit/client/account/SignInResult.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/SshKeyPanel.java b/src/main/java/com/google/gerrit/client/account/SshKeyPanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/SshKeyPanel.java rename to src/main/java/com/google/gerrit/client/account/SshKeyPanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/Util.java b/src/main/java/com/google/gerrit/client/account/Util.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/Util.java rename to src/main/java/com/google/gerrit/client/account/Util.java diff --git a/appjar/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java b/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java rename to src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/AccountGroupDetail.java b/src/main/java/com/google/gerrit/client/admin/AccountGroupDetail.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/AccountGroupDetail.java rename to src/main/java/com/google/gerrit/client/admin/AccountGroupDetail.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java b/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java rename to src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/AdminConstants.java b/src/main/java/com/google/gerrit/client/admin/AdminConstants.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/AdminConstants.java rename to src/main/java/com/google/gerrit/client/admin/AdminConstants.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties b/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties rename to src/main/java/com/google/gerrit/client/admin/AdminConstants.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/AdminMessages.java b/src/main/java/com/google/gerrit/client/admin/AdminMessages.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/AdminMessages.java rename to src/main/java/com/google/gerrit/client/admin/AdminMessages.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties b/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties rename to src/main/java/com/google/gerrit/client/admin/AdminMessages.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/GroupAdminService.java b/src/main/java/com/google/gerrit/client/admin/GroupAdminService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/GroupAdminService.java rename to src/main/java/com/google/gerrit/client/admin/GroupAdminService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java b/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java rename to src/main/java/com/google/gerrit/client/admin/GroupListScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java b/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java rename to src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java b/src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java rename to src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/ProjectDetail.java b/src/main/java/com/google/gerrit/client/admin/ProjectDetail.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/ProjectDetail.java rename to src/main/java/com/google/gerrit/client/admin/ProjectDetail.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java b/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java rename to src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/admin/Util.java b/src/main/java/com/google/gerrit/client/admin/Util.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/admin/Util.java rename to src/main/java/com/google/gerrit/client/admin/Util.java diff --git a/appjar/src/main/java/com/google/gerrit/client/arrowRight.gif b/src/main/java/com/google/gerrit/client/arrowRight.gif similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/arrowRight.gif rename to src/main/java/com/google/gerrit/client/arrowRight.gif diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java b/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java rename to src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java b/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java rename to src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java b/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java rename to src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java b/src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java rename to src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java b/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java rename to src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java b/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java rename to src/main/java/com/google/gerrit/client/changes/ApprovalTable.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java b/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java rename to src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java b/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java rename to src/main/java/com/google/gerrit/client/changes/ChangeConstants.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties b/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties rename to src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java b/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java rename to src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java b/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java rename to src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java b/src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java rename to src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java b/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java rename to src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeListService.java b/src/main/java/com/google/gerrit/client/changes/ChangeListService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeListService.java rename to src/main/java/com/google/gerrit/client/changes/ChangeListService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java b/src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java rename to src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeManageService.java b/src/main/java/com/google/gerrit/client/changes/ChangeManageService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeManageService.java rename to src/main/java/com/google/gerrit/client/changes/ChangeManageService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java b/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java rename to src/main/java/com/google/gerrit/client/changes/ChangeMessages.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties b/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties rename to src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties b/src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties rename to src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java b/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java rename to src/main/java/com/google/gerrit/client/changes/ChangeScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ChangeTable.java b/src/main/java/com/google/gerrit/client/changes/ChangeTable.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ChangeTable.java rename to src/main/java/com/google/gerrit/client/changes/ChangeTable.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/MessagePanel.java b/src/main/java/com/google/gerrit/client/changes/MessagePanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/MessagePanel.java rename to src/main/java/com/google/gerrit/client/changes/MessagePanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java b/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java rename to src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java b/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java rename to src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java b/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java rename to src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java b/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java rename to src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java b/src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java rename to src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/PatchTable.java b/src/main/java/com/google/gerrit/client/changes/PatchTable.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/PatchTable.java rename to src/main/java/com/google/gerrit/client/changes/PatchTable.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java b/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java rename to src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java b/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java rename to src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java diff --git a/appjar/src/main/java/com/google/gerrit/client/changes/Util.java b/src/main/java/com/google/gerrit/client/changes/Util.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/changes/Util.java rename to src/main/java/com/google/gerrit/client/changes/Util.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/AccountCache.java b/src/main/java/com/google/gerrit/client/data/AccountCache.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/AccountCache.java rename to src/main/java/com/google/gerrit/client/data/AccountCache.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java b/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java rename to src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/AccountInfo.java b/src/main/java/com/google/gerrit/client/data/AccountInfo.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/AccountInfo.java rename to src/main/java/com/google/gerrit/client/data/AccountInfo.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java b/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java rename to src/main/java/com/google/gerrit/client/data/AccountInfoCache.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java b/src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java rename to src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java b/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java rename to src/main/java/com/google/gerrit/client/data/ApprovalDetail.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/ApprovalType.java b/src/main/java/com/google/gerrit/client/data/ApprovalType.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/ApprovalType.java rename to src/main/java/com/google/gerrit/client/data/ApprovalType.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/BasePatchDetail.java b/src/main/java/com/google/gerrit/client/data/BasePatchDetail.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/BasePatchDetail.java rename to src/main/java/com/google/gerrit/client/data/BasePatchDetail.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/ChangeDetail.java b/src/main/java/com/google/gerrit/client/data/ChangeDetail.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/ChangeDetail.java rename to src/main/java/com/google/gerrit/client/data/ChangeDetail.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/ChangeInfo.java b/src/main/java/com/google/gerrit/client/data/ChangeInfo.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/ChangeInfo.java rename to src/main/java/com/google/gerrit/client/data/ChangeInfo.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/GerritConfig.java b/src/main/java/com/google/gerrit/client/data/GerritConfig.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/GerritConfig.java rename to src/main/java/com/google/gerrit/client/data/GerritConfig.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/GitwebLink.java b/src/main/java/com/google/gerrit/client/data/GitwebLink.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/GitwebLink.java rename to src/main/java/com/google/gerrit/client/data/GitwebLink.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/GroupCache.java b/src/main/java/com/google/gerrit/client/data/GroupCache.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/GroupCache.java rename to src/main/java/com/google/gerrit/client/data/GroupCache.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/LineWithComments.java b/src/main/java/com/google/gerrit/client/data/LineWithComments.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/LineWithComments.java rename to src/main/java/com/google/gerrit/client/data/LineWithComments.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/PatchLine.java b/src/main/java/com/google/gerrit/client/data/PatchLine.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/PatchLine.java rename to src/main/java/com/google/gerrit/client/data/PatchLine.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java b/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java rename to src/main/java/com/google/gerrit/client/data/PatchSetDetail.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/ProjectCache.java b/src/main/java/com/google/gerrit/client/data/ProjectCache.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/ProjectCache.java rename to src/main/java/com/google/gerrit/client/data/ProjectCache.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/ProjectInfo.java b/src/main/java/com/google/gerrit/client/data/ProjectInfo.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/ProjectInfo.java rename to src/main/java/com/google/gerrit/client/data/ProjectInfo.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/SideBySideLine.java b/src/main/java/com/google/gerrit/client/data/SideBySideLine.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/SideBySideLine.java rename to src/main/java/com/google/gerrit/client/data/SideBySideLine.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java b/src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java rename to src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java b/src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java rename to src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/SystemInfoService.java b/src/main/java/com/google/gerrit/client/data/SystemInfoService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/SystemInfoService.java rename to src/main/java/com/google/gerrit/client/data/SystemInfoService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java b/src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java rename to src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java diff --git a/appjar/src/main/java/com/google/gerrit/client/greenCheck.png b/src/main/java/com/google/gerrit/client/greenCheck.png similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/greenCheck.png rename to src/main/java/com/google/gerrit/client/greenCheck.png diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/AllowFrameImpl.java b/src/main/java/com/google/gerrit/client/openid/AllowFrameImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/AllowFrameImpl.java rename to src/main/java/com/google/gerrit/client/openid/AllowFrameImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/AllowFrameImplMobile.java b/src/main/java/com/google/gerrit/client/openid/AllowFrameImplMobile.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/AllowFrameImplMobile.java rename to src/main/java/com/google/gerrit/client/openid/AllowFrameImplMobile.java diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/AllowFrameImplSafari.java b/src/main/java/com/google/gerrit/client/openid/AllowFrameImplSafari.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/AllowFrameImplSafari.java rename to src/main/java/com/google/gerrit/client/openid/AllowFrameImplSafari.java diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/DiscoveryResult.java b/src/main/java/com/google/gerrit/client/openid/DiscoveryResult.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/DiscoveryResult.java rename to src/main/java/com/google/gerrit/client/openid/DiscoveryResult.java diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/LoginConstants.java b/src/main/java/com/google/gerrit/client/openid/LoginConstants.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/LoginConstants.java rename to src/main/java/com/google/gerrit/client/openid/LoginConstants.java diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/LoginConstants.properties b/src/main/java/com/google/gerrit/client/openid/LoginConstants.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/LoginConstants.properties rename to src/main/java/com/google/gerrit/client/openid/LoginConstants.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/LoginIcons.java b/src/main/java/com/google/gerrit/client/openid/LoginIcons.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/LoginIcons.java rename to src/main/java/com/google/gerrit/client/openid/LoginIcons.java diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/LoginMessages.java b/src/main/java/com/google/gerrit/client/openid/LoginMessages.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/LoginMessages.java rename to src/main/java/com/google/gerrit/client/openid/LoginMessages.java diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/LoginMessages.properties b/src/main/java/com/google/gerrit/client/openid/LoginMessages.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/LoginMessages.properties rename to src/main/java/com/google/gerrit/client/openid/LoginMessages.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/OpenIdLoginPanel.java b/src/main/java/com/google/gerrit/client/openid/OpenIdLoginPanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/OpenIdLoginPanel.java rename to src/main/java/com/google/gerrit/client/openid/OpenIdLoginPanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/OpenIdService.java b/src/main/java/com/google/gerrit/client/openid/OpenIdService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/OpenIdService.java rename to src/main/java/com/google/gerrit/client/openid/OpenIdService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/OpenIdUtil.java b/src/main/java/com/google/gerrit/client/openid/OpenIdUtil.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/OpenIdUtil.java rename to src/main/java/com/google/gerrit/client/openid/OpenIdUtil.java diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/iconGoogle.gif b/src/main/java/com/google/gerrit/client/openid/iconGoogle.gif similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/iconGoogle.gif rename to src/main/java/com/google/gerrit/client/openid/iconGoogle.gif diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/iconYahoo.gif b/src/main/java/com/google/gerrit/client/openid/iconYahoo.gif similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/iconYahoo.gif rename to src/main/java/com/google/gerrit/client/openid/iconYahoo.gif diff --git a/appjar/src/main/java/com/google/gerrit/client/openid/openidLogo.png b/src/main/java/com/google/gerrit/client/openid/openidLogo.png similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/openid/openidLogo.png rename to src/main/java/com/google/gerrit/client/openid/openidLogo.png diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java b/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java rename to src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java b/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java rename to src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java b/src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java rename to src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchConstants.java b/src/main/java/com/google/gerrit/client/patches/PatchConstants.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/PatchConstants.java rename to src/main/java/com/google/gerrit/client/patches/PatchConstants.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties b/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties rename to src/main/java/com/google/gerrit/client/patches/PatchConstants.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java b/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java rename to src/main/java/com/google/gerrit/client/patches/PatchDetailService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.java b/src/main/java/com/google/gerrit/client/patches/PatchMessages.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.java rename to src/main/java/com/google/gerrit/client/patches/PatchMessages.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties b/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties rename to src/main/java/com/google/gerrit/client/patches/PatchMessages.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties b/src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties rename to src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchScreen.java b/src/main/java/com/google/gerrit/client/patches/PatchScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/PatchScreen.java rename to src/main/java/com/google/gerrit/client/patches/PatchScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java b/src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java rename to src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java b/src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java rename to src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/PatchUtil.java b/src/main/java/com/google/gerrit/client/patches/PatchUtil.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/PatchUtil.java rename to src/main/java/com/google/gerrit/client/patches/PatchUtil.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java b/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java rename to src/main/java/com/google/gerrit/client/patches/SideBySideTable.java diff --git a/appjar/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java b/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java rename to src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java diff --git a/appjar/src/main/java/com/google/gerrit/client/redNot.png b/src/main/java/com/google/gerrit/client/redNot.png similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/redNot.png rename to src/main/java/com/google/gerrit/client/redNot.png diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/Account.java b/src/main/java/com/google/gerrit/client/reviewdb/Account.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/Account.java rename to src/main/java/com/google/gerrit/client/reviewdb/Account.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java rename to src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java rename to src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/Branch.java b/src/main/java/com/google/gerrit/client/reviewdb/Branch.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/Branch.java rename to src/main/java/com/google/gerrit/client/reviewdb/Branch.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/Change.java b/src/main/java/com/google/gerrit/client/reviewdb/Change.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/Change.java rename to src/main/java/com/google/gerrit/client/reviewdb/Change.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java b/src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java rename to src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java b/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java rename to src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java b/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java rename to src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java b/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java rename to src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/Patch.java b/src/main/java/com/google/gerrit/client/reviewdb/Patch.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/Patch.java rename to src/main/java/com/google/gerrit/client/reviewdb/Patch.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/Project.java b/src/main/java/com/google/gerrit/client/reviewdb/Project.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/Project.java rename to src/main/java/com/google/gerrit/client/reviewdb/Project.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java b/src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java rename to src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/RevId.java b/src/main/java/com/google/gerrit/client/reviewdb/RevId.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/RevId.java rename to src/main/java/com/google/gerrit/client/reviewdb/RevId.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java b/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java rename to src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java b/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java rename to src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java b/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java rename to src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java b/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java rename to src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java b/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java rename to src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java b/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java rename to src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java b/src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java rename to src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/Common.java b/src/main/java/com/google/gerrit/client/rpc/Common.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/Common.java rename to src/main/java/com/google/gerrit/client/rpc/Common.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java b/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java rename to src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java b/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java rename to src/main/java/com/google/gerrit/client/rpc/GerritCallback.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java b/src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java rename to src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/NoDifferencesException.java b/src/main/java/com/google/gerrit/client/rpc/NoDifferencesException.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/NoDifferencesException.java rename to src/main/java/com/google/gerrit/client/rpc/NoDifferencesException.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java b/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java rename to src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java b/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java rename to src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java b/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java rename to src/main/java/com/google/gerrit/client/rpc/RpcConstants.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/RpcConstants.properties b/src/main/java/com/google/gerrit/client/rpc/RpcConstants.properties similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/RpcConstants.properties rename to src/main/java/com/google/gerrit/client/rpc/RpcConstants.properties diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java b/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java rename to src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java diff --git a/appjar/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java b/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java rename to src/main/java/com/google/gerrit/client/rpc/SignInRequired.java diff --git a/appjar/src/main/java/com/google/gerrit/client/starFilled.gif b/src/main/java/com/google/gerrit/client/starFilled.gif similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/starFilled.gif rename to src/main/java/com/google/gerrit/client/starFilled.gif diff --git a/appjar/src/main/java/com/google/gerrit/client/starOpen.gif b/src/main/java/com/google/gerrit/client/starOpen.gif similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/starOpen.gif rename to src/main/java/com/google/gerrit/client/starOpen.gif diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java b/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java rename to src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java b/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java rename to src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/AccountScreen.java b/src/main/java/com/google/gerrit/client/ui/AccountScreen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/AccountScreen.java rename to src/main/java/com/google/gerrit/client/ui/AccountScreen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java b/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java rename to src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java b/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java rename to src/main/java/com/google/gerrit/client/ui/AddMemberBox.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/AutoCenterDialogBox.java b/src/main/java/com/google/gerrit/client/ui/AutoCenterDialogBox.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/AutoCenterDialogBox.java rename to src/main/java/com/google/gerrit/client/ui/AutoCenterDialogBox.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/ChangeLink.java b/src/main/java/com/google/gerrit/client/ui/ChangeLink.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/ChangeLink.java rename to src/main/java/com/google/gerrit/client/ui/ChangeLink.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java b/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java rename to src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java b/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java rename to src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/DomUtil.java b/src/main/java/com/google/gerrit/client/ui/DomUtil.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/DomUtil.java rename to src/main/java/com/google/gerrit/client/ui/DomUtil.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java b/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java rename to src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java b/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java rename to src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/LazyTabChild.java b/src/main/java/com/google/gerrit/client/ui/LazyTabChild.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/LazyTabChild.java rename to src/main/java/com/google/gerrit/client/ui/LazyTabChild.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java b/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java rename to src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java b/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java rename to src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/PatchLink.java b/src/main/java/com/google/gerrit/client/ui/PatchLink.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/PatchLink.java rename to src/main/java/com/google/gerrit/client/ui/PatchLink.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/ProgressMeter.java b/src/main/java/com/google/gerrit/client/ui/ProgressMeter.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/ProgressMeter.java rename to src/main/java/com/google/gerrit/client/ui/ProgressMeter.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java b/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java rename to src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/ProjectOpenLink.java b/src/main/java/com/google/gerrit/client/ui/ProjectOpenLink.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/ProjectOpenLink.java rename to src/main/java/com/google/gerrit/client/ui/ProjectOpenLink.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/RefreshListener.java b/src/main/java/com/google/gerrit/client/ui/RefreshListener.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/RefreshListener.java rename to src/main/java/com/google/gerrit/client/ui/RefreshListener.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/Screen.java b/src/main/java/com/google/gerrit/client/ui/Screen.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/Screen.java rename to src/main/java/com/google/gerrit/client/ui/Screen.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/SmallHeading.java b/src/main/java/com/google/gerrit/client/ui/SmallHeading.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/SmallHeading.java rename to src/main/java/com/google/gerrit/client/ui/SmallHeading.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/SuggestService.java b/src/main/java/com/google/gerrit/client/ui/SuggestService.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/SuggestService.java rename to src/main/java/com/google/gerrit/client/ui/SuggestService.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/SuggestServiceImpl.java b/src/main/java/com/google/gerrit/client/ui/SuggestServiceImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/SuggestServiceImpl.java rename to src/main/java/com/google/gerrit/client/ui/SuggestServiceImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java b/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java rename to src/main/java/com/google/gerrit/client/ui/SuggestUtil.java diff --git a/appjar/src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java b/src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java rename to src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java diff --git a/appjar/src/main/java/com/google/gerrit/client/workflow/CategoryFunction.java b/src/main/java/com/google/gerrit/client/workflow/CategoryFunction.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/workflow/CategoryFunction.java rename to src/main/java/com/google/gerrit/client/workflow/CategoryFunction.java diff --git a/appjar/src/main/java/com/google/gerrit/client/workflow/FunctionState.java b/src/main/java/com/google/gerrit/client/workflow/FunctionState.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/workflow/FunctionState.java rename to src/main/java/com/google/gerrit/client/workflow/FunctionState.java diff --git a/appjar/src/main/java/com/google/gerrit/client/workflow/MaxWithBlock.java b/src/main/java/com/google/gerrit/client/workflow/MaxWithBlock.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/workflow/MaxWithBlock.java rename to src/main/java/com/google/gerrit/client/workflow/MaxWithBlock.java diff --git a/appjar/src/main/java/com/google/gerrit/client/workflow/NoOpFunction.java b/src/main/java/com/google/gerrit/client/workflow/NoOpFunction.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/workflow/NoOpFunction.java rename to src/main/java/com/google/gerrit/client/workflow/NoOpFunction.java diff --git a/appjar/src/main/java/com/google/gerrit/client/workflow/SubmitFunction.java b/src/main/java/com/google/gerrit/client/workflow/SubmitFunction.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/client/workflow/SubmitFunction.java rename to src/main/java/com/google/gerrit/client/workflow/SubmitFunction.java diff --git a/appjar/src/main/java/com/google/gerrit/git/CodeReviewCommit.java b/src/main/java/com/google/gerrit/git/CodeReviewCommit.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/CodeReviewCommit.java rename to src/main/java/com/google/gerrit/git/CodeReviewCommit.java diff --git a/appjar/src/main/java/com/google/gerrit/git/CommitMergeStatus.java b/src/main/java/com/google/gerrit/git/CommitMergeStatus.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/CommitMergeStatus.java rename to src/main/java/com/google/gerrit/git/CommitMergeStatus.java diff --git a/appjar/src/main/java/com/google/gerrit/git/GitMetaUtil.java b/src/main/java/com/google/gerrit/git/GitMetaUtil.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/GitMetaUtil.java rename to src/main/java/com/google/gerrit/git/GitMetaUtil.java diff --git a/appjar/src/main/java/com/google/gerrit/git/InvalidRepositoryException.java b/src/main/java/com/google/gerrit/git/InvalidRepositoryException.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/InvalidRepositoryException.java rename to src/main/java/com/google/gerrit/git/InvalidRepositoryException.java diff --git a/appjar/src/main/java/com/google/gerrit/git/MergeException.java b/src/main/java/com/google/gerrit/git/MergeException.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/MergeException.java rename to src/main/java/com/google/gerrit/git/MergeException.java diff --git a/appjar/src/main/java/com/google/gerrit/git/MergeOp.java b/src/main/java/com/google/gerrit/git/MergeOp.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/MergeOp.java rename to src/main/java/com/google/gerrit/git/MergeOp.java diff --git a/appjar/src/main/java/com/google/gerrit/git/MergeQueue.java b/src/main/java/com/google/gerrit/git/MergeQueue.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/MergeQueue.java rename to src/main/java/com/google/gerrit/git/MergeQueue.java diff --git a/appjar/src/main/java/com/google/gerrit/git/MergeSorter.java b/src/main/java/com/google/gerrit/git/MergeSorter.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/MergeSorter.java rename to src/main/java/com/google/gerrit/git/MergeSorter.java diff --git a/appjar/src/main/java/com/google/gerrit/git/PatchSetImporter.java b/src/main/java/com/google/gerrit/git/PatchSetImporter.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/PatchSetImporter.java rename to src/main/java/com/google/gerrit/git/PatchSetImporter.java diff --git a/appjar/src/main/java/com/google/gerrit/git/PushQueue.java b/src/main/java/com/google/gerrit/git/PushQueue.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/PushQueue.java rename to src/main/java/com/google/gerrit/git/PushQueue.java diff --git a/appjar/src/main/java/com/google/gerrit/git/RepositoryCache.java b/src/main/java/com/google/gerrit/git/RepositoryCache.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/RepositoryCache.java rename to src/main/java/com/google/gerrit/git/RepositoryCache.java diff --git a/appjar/src/main/java/com/google/gerrit/git/WorkQueue.java b/src/main/java/com/google/gerrit/git/WorkQueue.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/git/WorkQueue.java rename to src/main/java/com/google/gerrit/git/WorkQueue.java diff --git a/appjar/src/main/java/com/google/gerrit/pgm/CreateSchema.java b/src/main/java/com/google/gerrit/pgm/CreateSchema.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/pgm/CreateSchema.java rename to src/main/java/com/google/gerrit/pgm/CreateSchema.java diff --git a/appjar/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java b/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java rename to src/main/java/com/google/gerrit/pgm/ImportGerrit1.java diff --git a/appjar/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java b/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java rename to src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java diff --git a/appjar/src/main/java/com/google/gerrit/pgm/Version.java b/src/main/java/com/google/gerrit/pgm/Version.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/pgm/Version.java rename to src/main/java/com/google/gerrit/pgm/Version.java diff --git a/appjar/src/main/java/com/google/gerrit/public/Gerrit.css b/src/main/java/com/google/gerrit/public/Gerrit.css similarity index 100% rename from appjar/src/main/java/com/google/gerrit/public/Gerrit.css rename to src/main/java/com/google/gerrit/public/Gerrit.css diff --git a/appjar/src/main/java/com/google/gerrit/public/Gerrit.html b/src/main/java/com/google/gerrit/public/Gerrit.html similarity index 100% rename from appjar/src/main/java/com/google/gerrit/public/Gerrit.html rename to src/main/java/com/google/gerrit/public/Gerrit.html diff --git a/appjar/src/main/java/com/google/gerrit/public/SetCookie.html b/src/main/java/com/google/gerrit/public/SetCookie.html similarity index 100% rename from appjar/src/main/java/com/google/gerrit/public/SetCookie.html rename to src/main/java/com/google/gerrit/public/SetCookie.html diff --git a/appjar/src/main/java/com/google/gerrit/public/favicon.ico b/src/main/java/com/google/gerrit/public/favicon.ico similarity index 100% rename from appjar/src/main/java/com/google/gerrit/public/favicon.ico rename to src/main/java/com/google/gerrit/public/favicon.ico diff --git a/appjar/src/main/java/com/google/gerrit/public/openidlogin_bg1.cache.gif b/src/main/java/com/google/gerrit/public/openidlogin_bg1.cache.gif similarity index 100% rename from appjar/src/main/java/com/google/gerrit/public/openidlogin_bg1.cache.gif rename to src/main/java/com/google/gerrit/public/openidlogin_bg1.cache.gif diff --git a/appjar/src/main/java/com/google/gerrit/public/robots.txt b/src/main/java/com/google/gerrit/public/robots.txt similarity index 100% rename from appjar/src/main/java/com/google/gerrit/public/robots.txt rename to src/main/java/com/google/gerrit/public/robots.txt diff --git a/appjar/src/main/java/com/google/gerrit/server/AccountSecurityImpl.java b/src/main/java/com/google/gerrit/server/AccountSecurityImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/AccountSecurityImpl.java rename to src/main/java/com/google/gerrit/server/AccountSecurityImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/server/AccountSecuritySrv.java b/src/main/java/com/google/gerrit/server/AccountSecuritySrv.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/AccountSecuritySrv.java rename to src/main/java/com/google/gerrit/server/AccountSecuritySrv.java diff --git a/appjar/src/main/java/com/google/gerrit/server/AccountServiceSrv.java b/src/main/java/com/google/gerrit/server/AccountServiceSrv.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/AccountServiceSrv.java rename to src/main/java/com/google/gerrit/server/AccountServiceSrv.java diff --git a/appjar/src/main/java/com/google/gerrit/server/CacheControlFilter.java b/src/main/java/com/google/gerrit/server/CacheControlFilter.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/CacheControlFilter.java rename to src/main/java/com/google/gerrit/server/CacheControlFilter.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java b/src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java rename to src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java b/src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java rename to src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ChangeMail.java b/src/main/java/com/google/gerrit/server/ChangeMail.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ChangeMail.java rename to src/main/java/com/google/gerrit/server/ChangeMail.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ChangeManageServiceImpl.java b/src/main/java/com/google/gerrit/server/ChangeManageServiceImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ChangeManageServiceImpl.java rename to src/main/java/com/google/gerrit/server/ChangeManageServiceImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ChangeManageServiceSrv.java b/src/main/java/com/google/gerrit/server/ChangeManageServiceSrv.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ChangeManageServiceSrv.java rename to src/main/java/com/google/gerrit/server/ChangeManageServiceSrv.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ChangeUtil.java b/src/main/java/com/google/gerrit/server/ChangeUtil.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ChangeUtil.java rename to src/main/java/com/google/gerrit/server/ChangeUtil.java diff --git a/appjar/src/main/java/com/google/gerrit/server/GerritCall.java b/src/main/java/com/google/gerrit/server/GerritCall.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/GerritCall.java rename to src/main/java/com/google/gerrit/server/GerritCall.java diff --git a/appjar/src/main/java/com/google/gerrit/server/GerritJsonServlet.java b/src/main/java/com/google/gerrit/server/GerritJsonServlet.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/GerritJsonServlet.java rename to src/main/java/com/google/gerrit/server/GerritJsonServlet.java diff --git a/appjar/src/main/java/com/google/gerrit/server/GerritOpenIdUserManager.java b/src/main/java/com/google/gerrit/server/GerritOpenIdUserManager.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/GerritOpenIdUserManager.java rename to src/main/java/com/google/gerrit/server/GerritOpenIdUserManager.java diff --git a/appjar/src/main/java/com/google/gerrit/server/GerritServer.java b/src/main/java/com/google/gerrit/server/GerritServer.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/GerritServer.java rename to src/main/java/com/google/gerrit/server/GerritServer.java diff --git a/appjar/src/main/java/com/google/gerrit/server/GroupAdminServiceImpl.java b/src/main/java/com/google/gerrit/server/GroupAdminServiceImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/GroupAdminServiceImpl.java rename to src/main/java/com/google/gerrit/server/GroupAdminServiceImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/server/GroupAdminServiceSrv.java b/src/main/java/com/google/gerrit/server/GroupAdminServiceSrv.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/GroupAdminServiceSrv.java rename to src/main/java/com/google/gerrit/server/GroupAdminServiceSrv.java diff --git a/appjar/src/main/java/com/google/gerrit/server/HostPageServlet.java b/src/main/java/com/google/gerrit/server/HostPageServlet.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/HostPageServlet.java rename to src/main/java/com/google/gerrit/server/HostPageServlet.java diff --git a/appjar/src/main/java/com/google/gerrit/server/HtmlDomUtil.java b/src/main/java/com/google/gerrit/server/HtmlDomUtil.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/HtmlDomUtil.java rename to src/main/java/com/google/gerrit/server/HtmlDomUtil.java diff --git a/appjar/src/main/java/com/google/gerrit/server/MimeMessage.java b/src/main/java/com/google/gerrit/server/MimeMessage.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/MimeMessage.java rename to src/main/java/com/google/gerrit/server/MimeMessage.java diff --git a/appjar/src/main/java/com/google/gerrit/server/OpenIdLoginServlet.java b/src/main/java/com/google/gerrit/server/OpenIdLoginServlet.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/OpenIdLoginServlet.java rename to src/main/java/com/google/gerrit/server/OpenIdLoginServlet.java diff --git a/appjar/src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java b/src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java rename to src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ProjectAdminServiceImpl.java b/src/main/java/com/google/gerrit/server/ProjectAdminServiceImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ProjectAdminServiceImpl.java rename to src/main/java/com/google/gerrit/server/ProjectAdminServiceImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ProjectAdminServiceSrv.java b/src/main/java/com/google/gerrit/server/ProjectAdminServiceSrv.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ProjectAdminServiceSrv.java rename to src/main/java/com/google/gerrit/server/ProjectAdminServiceSrv.java diff --git a/appjar/src/main/java/com/google/gerrit/server/StaticServlet.java b/src/main/java/com/google/gerrit/server/StaticServlet.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/StaticServlet.java rename to src/main/java/com/google/gerrit/server/StaticServlet.java diff --git a/appjar/src/main/java/com/google/gerrit/server/SuggestServiceSrv.java b/src/main/java/com/google/gerrit/server/SuggestServiceSrv.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/SuggestServiceSrv.java rename to src/main/java/com/google/gerrit/server/SuggestServiceSrv.java diff --git a/appjar/src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java b/src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java rename to src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java b/src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java rename to src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java diff --git a/appjar/src/main/java/com/google/gerrit/server/UrlRewriteFilter.java b/src/main/java/com/google/gerrit/server/UrlRewriteFilter.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/UrlRewriteFilter.java rename to src/main/java/com/google/gerrit/server/UrlRewriteFilter.java diff --git a/appjar/src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java b/src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java rename to src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java diff --git a/appjar/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java b/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java rename to src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java diff --git a/appjar/src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java b/src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java rename to src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java diff --git a/appjar/src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java b/src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java rename to src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/AbstractCommand.java b/src/main/java/com/google/gerrit/server/ssh/AbstractCommand.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/AbstractCommand.java rename to src/main/java/com/google/gerrit/server/ssh/AbstractCommand.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/AbstractGitCommand.java b/src/main/java/com/google/gerrit/server/ssh/AbstractGitCommand.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/AbstractGitCommand.java rename to src/main/java/com/google/gerrit/server/ssh/AbstractGitCommand.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/AdminFlushCaches.java b/src/main/java/com/google/gerrit/server/ssh/AdminFlushCaches.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/AdminFlushCaches.java rename to src/main/java/com/google/gerrit/server/ssh/AdminFlushCaches.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java b/src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java rename to src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/GerritCommandFactory.java b/src/main/java/com/google/gerrit/server/ssh/GerritCommandFactory.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/GerritCommandFactory.java rename to src/main/java/com/google/gerrit/server/ssh/GerritCommandFactory.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/ListProjects.java b/src/main/java/com/google/gerrit/server/ssh/ListProjects.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/ListProjects.java rename to src/main/java/com/google/gerrit/server/ssh/ListProjects.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/NoShell.java b/src/main/java/com/google/gerrit/server/ssh/NoShell.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/NoShell.java rename to src/main/java/com/google/gerrit/server/ssh/NoShell.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/Receive.java b/src/main/java/com/google/gerrit/server/ssh/Receive.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/Receive.java rename to src/main/java/com/google/gerrit/server/ssh/Receive.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/SshServlet.java b/src/main/java/com/google/gerrit/server/ssh/SshServlet.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/SshServlet.java rename to src/main/java/com/google/gerrit/server/ssh/SshServlet.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/SshUtil.java b/src/main/java/com/google/gerrit/server/ssh/SshUtil.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/SshUtil.java rename to src/main/java/com/google/gerrit/server/ssh/SshUtil.java diff --git a/appjar/src/main/java/com/google/gerrit/server/ssh/Upload.java b/src/main/java/com/google/gerrit/server/ssh/Upload.java similarity index 100% rename from appjar/src/main/java/com/google/gerrit/server/ssh/Upload.java rename to src/main/java/com/google/gerrit/server/ssh/Upload.java diff --git a/appjar/src/main/java/log4j.properties b/src/main/java/log4j.properties similarity index 100% rename from appjar/src/main/java/log4j.properties rename to src/main/java/log4j.properties diff --git a/appjar/src/main/webapp/WEB-INF/extra/jetty_gerrit.xml b/src/main/webapp/WEB-INF/extra/jetty_gerrit.xml similarity index 100% rename from appjar/src/main/webapp/WEB-INF/extra/jetty_gerrit.xml rename to src/main/webapp/WEB-INF/extra/jetty_gerrit.xml diff --git a/appjar/src/main/webapp/WEB-INF/sql/query_index.sql b/src/main/webapp/WEB-INF/sql/query_index.sql similarity index 100% rename from appjar/src/main/webapp/WEB-INF/sql/query_index.sql rename to src/main/webapp/WEB-INF/sql/query_index.sql diff --git a/appjar/src/main/webapp/WEB-INF/sql/upgrade003_004.sql b/src/main/webapp/WEB-INF/sql/upgrade003_004.sql similarity index 100% rename from appjar/src/main/webapp/WEB-INF/sql/upgrade003_004.sql rename to src/main/webapp/WEB-INF/sql/upgrade003_004.sql diff --git a/appjar/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from appjar/src/main/webapp/WEB-INF/web.xml rename to src/main/webapp/WEB-INF/web.xml diff --git a/to_jetty.sh b/to_jetty.sh index c37bd08abe..3cf40fce1d 100755 --- a/to_jetty.sh +++ b/to_jetty.sh @@ -16,8 +16,8 @@ fi ctx="$jetty/contexts/gerrit.xml" && -(cd appjar && mvn package) && -war=appjar/target/gerrit-*.war && +mvn package && +war=target/gerrit-*.war && cp $war "$jetty/webapps/gerrit.war" && if [ -f "$ctx" ]