From 44671f5c6929a8f05223dd359182610286ceb98a Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 7 Nov 2009 12:55:26 -0800 Subject: [PATCH] Rewrite our build as modular maven components This refactoring splits the code up into different components, with their own per-component CLASSPATH. By moving all of our classes into isolated components we can better isolate the classpaths and try to avoid unexpected dependency problems. It also allows us to more clearly define which components are used by the GWT UI and thus must be compiled under GWT, and which components are run on the server and can therefore use more of the J2SE API. Change-Id: I833cc22bacc5655d1c9099ed7c2b0e0a5b08855a Signed-off-by: Shawn O. Pearce --- .gitignore | 10 +- Documentation/dev-eclipse.txt | 27 +- Documentation/dev-readme.txt | 5 +- Documentation/install.txt | 2 +- gerrit-common/.gitignore | 5 + .../org.eclipse.core.resources.prefs | 0 .../.settings}/org.eclipse.core.runtime.prefs | 0 .../.settings}/org.eclipse.jdt.core.prefs | 0 .../.settings}/org.eclipse.jdt.ui.prefs | 0 gerrit-common/pom.xml | 85 ++ .../java/com/google/gerrit/Common.gwt.xml | 20 + .../com/google/gerrit/common/PageLinks.java | 68 ++ .../google/gerrit/common/auth/SignInMode.java | 19 + .../gerrit/common/auth}/SignInRequired.java | 7 +- .../common}/auth/openid/DiscoveryResult.java | 2 +- .../common}/auth/openid/OpenIdService.java | 6 +- .../gerrit/common/auth/openid/OpenIdUrls.java | 24 + .../common}/auth/userpass/LoginResult.java | 2 +- .../auth/userpass/UserPassAuthService.java | 2 +- .../common}/data/AccountDashboardInfo.java | 7 +- .../gerrit/common}/data/AccountInfo.java | 4 +- .../gerrit/common}/data/AccountInfoCache.java | 4 +- .../common/data}/AccountProjectWatchInfo.java | 6 +- .../gerrit/common/data}/AccountSecurity.java | 16 +- .../gerrit/common/data}/AccountService.java | 10 +- .../common/data}/AddReviewerResult.java | 3 +- .../gerrit/common/data}/AgreementInfo.java | 14 +- .../gerrit/common}/data/ApprovalDetail.java | 8 +- .../gerrit/common}/data/ApprovalSummary.java | 6 +- .../common}/data/ApprovalSummarySet.java | 4 +- .../gerrit/common}/data/ApprovalType.java | 8 +- .../gerrit/common}/data/ApprovalTypes.java | 4 +- .../gerrit/common}/data/ChangeDetail.java | 13 +- .../common/data}/ChangeDetailService.java | 10 +- .../gerrit/common}/data/ChangeInfo.java | 6 +- .../common/data}/ChangeListService.java | 14 +- .../common/data}/ChangeManageService.java | 7 +- .../gerrit/common/data}/CommentDetail.java | 9 +- .../google/gerrit/common}/data/EditList.java | 2 +- .../gerrit/common}/data/GerritConfig.java | 8 +- .../gerrit/common}/data/GitwebLink.java | 8 +- .../common/data}/GroupAdminService.java | 8 +- .../gerrit/common/data}/GroupDetail.java | 15 +- .../gerrit/common/data}/HostPageData.java | 5 +- .../common/data}/PatchDetailService.java | 21 +- .../gerrit/common}/data/PatchScript.java | 6 +- .../common}/data/PatchScriptSettings.java | 6 +- .../gerrit/common}/data/PatchSetDetail.java | 8 +- .../common/data}/PatchSetPublishDetail.java | 15 +- .../common/data}/ProjectAdminService.java | 12 +- .../gerrit/common/data}/ProjectDetail.java | 14 +- .../gerrit/common}/data/ProjectInfo.java | 4 +- .../common}/data/SingleListChangeInfo.java | 2 +- .../common}/data/SparseFileContent.java | 2 +- .../gerrit/common}/data/SshHostKey.java | 2 +- .../gerrit/common/data}/SuggestService.java | 7 +- .../common}/data/SystemInfoService.java | 6 +- .../common/data}/ToggleStarRequest.java | 4 +- .../ContactInformationStoreException.java | 2 +- .../errors}/CorruptEntityException.java | 2 +- .../common/errors}/InvalidNameException.java | 2 +- .../errors}/InvalidRevisionException.java | 2 +- .../errors}/InvalidSshKeyException.java | 2 +- .../errors}/InvalidSshUserNameException.java | 4 +- .../errors}/NameAlreadyUsedException.java | 2 +- .../errors}/NoSuchAccountException.java | 2 +- .../common/errors}/NoSuchEntityException.java | 2 +- .../common/errors}/NotSignedInException.java | 2 +- gerrit-gwtdebug/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-gwtdebug/pom.xml | 66 ++ .../gerrit/gwtdebug/GerritDebugLauncher.java | 419 +++++++++ gerrit-gwtui/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-gwtui/pom.xml | 259 +++++ .../com/google/gerrit/GerritGwtUI.gwt.xml | 5 +- .../java/com/google/gerrit/UserAgent.gwt.xml | 0 .../com/google/gerrit/client/ErrorDialog.java | 0 .../com/google/gerrit/client/FormatUtil.java | 4 +- .../java/com/google/gerrit/client/Gerrit.java | 42 +- .../google/gerrit/client/GerritConstants.java | 0 .../gerrit/client/GerritConstants.properties | 0 .../com/google/gerrit/client/GerritIcons.java | 0 .../google/gerrit/client/GerritMessages.java | 0 .../gerrit/client/GerritMessages.properties | 0 .../google/gerrit/client/HistoryHandler.java | 74 +- .../gerrit/client/HostPageDataService.java | 1 + .../com/google/gerrit/client/JumpKeys.java | 11 +- .../google/gerrit/client/NotFoundScreen.java | 0 .../gerrit/client/NotSignedInDialog.java | 0 .../com/google/gerrit/client/RpcStatus.java | 0 .../com/google/gerrit/client/SearchPanel.java | 7 +- .../google/gerrit/client/SignInDialog.java | 9 +- .../client/account/AccountConstants.java | 0 .../account/AccountConstants.properties | 0 .../client/account/AccountMessages.java | 0 .../client/account/AccountMessages.properties | 0 .../client/account/AccountSettings.java | 18 +- .../gerrit/client/account/AgreementPanel.java | 13 +- .../client/account/ContactPanelFull.java | 4 +- .../client/account/ContactPanelShort.java | 6 +- .../client/account/ExternalIdPanel.java | 11 +- .../gerrit/client/account/MyGroupsPanel.java | 2 +- .../client/account/NewAgreementScreen.java | 11 +- .../client/account/PreferencePanel.java | 14 +- .../client/account/ProjectWatchPanel.java | 7 +- .../gerrit/client/account/RegisterScreen.java | 6 +- .../client/account/SshHostKeyPanel.java | 2 +- .../gerrit/client/account/SshPanel.java | 10 +- .../google/gerrit/client/account/Util.java | 2 + .../client/account/ValidateEmailScreen.java | 4 +- .../client/admin/AccountGroupScreen.java | 9 +- .../gerrit/client/admin/AdminConstants.java | 0 .../client/admin/AdminConstants.properties | 0 .../gerrit/client/admin/AdminMessages.java | 0 .../client/admin/AdminMessages.properties | 0 .../gerrit/client/admin/GroupListScreen.java | 9 +- .../gerrit/client/admin/GroupTable.java | 8 +- .../client/admin/ProjectAdminScreen.java | 11 +- .../client/admin/ProjectBranchesPanel.java | 10 +- .../gerrit/client/admin/ProjectInfoPanel.java | 3 +- .../client/admin/ProjectListScreen.java | 9 +- .../client/admin/ProjectRightsPanel.java | 15 +- .../com/google/gerrit/client/admin/Util.java | 4 +- .../com/google/gerrit/client/arrowRight.gif | Bin .../client/auth/openid/LoginConstants.java | 0 .../auth/openid/LoginConstants.properties | 0 .../gerrit/client/auth/openid/LoginIcons.java | 0 .../client/auth/openid/LoginMessages.java | 0 .../auth/openid/LoginMessages.properties | 0 .../auth/openid/OpenIdSignInDialog.java | 13 +- .../gerrit/client/auth/openid/OpenIdUtil.java | 22 +- .../gerrit/client/auth/openid/iconGoogle.gif | Bin .../gerrit/client/auth/openid/iconYahoo.gif | Bin .../gerrit/client/auth/openid/openidLogo.png | Bin .../client/auth/userpass/LoginConstants.java | 0 .../auth/userpass/LoginConstants.properties | 0 .../client/auth/userpass/LoginMessages.java | 0 .../auth/userpass/LoginMessages.properties | 0 .../auth/userpass/UserPassSignInDialog.java | 10 +- .../gerrit/client/auth/userpass/Util.java | 1 + .../client/changes/AbandonChangeDialog.java | 4 +- .../changes/AccountDashboardScreen.java | 10 +- .../changes/AllAbandonedChangesScreen.java | 2 +- .../changes/AllMergedChangesScreen.java | 2 +- .../client/changes/AllOpenChangesScreen.java | 0 .../client/changes/AllSingleListScreen.java | 6 +- .../gerrit/client/changes/ApprovalTable.java | 20 +- .../ByProjectAbandonedChangesScreen.java | 4 +- .../changes/ByProjectMergedChangesScreen.java | 4 +- .../changes/ByProjectOpenChangesScreen.java | 2 +- .../client/changes/ChangeConstants.java | 0 .../client/changes/ChangeConstants.properties | 0 .../changes/ChangeDescriptionBlock.java | 6 +- .../client/changes/ChangeInfoBlock.java | 6 +- .../gerrit/client/changes/ChangeMessages.java | 0 .../client/changes/ChangeMessages.properties | 0 .../changes/ChangeMessages_en.properties | 0 .../changes/ChangeQueryResultsScreen.java | 8 +- .../gerrit/client/changes/ChangeScreen.java | 25 +- .../gerrit/client/changes/ChangeTable.java | 27 +- .../gerrit/client/changes/MessagePanel.java | 2 +- .../client/changes/MineDraftsScreen.java | 4 +- .../client/changes/MineSingleListScreen.java | 2 +- .../client/changes/MineStarredScreen.java | 4 +- .../gerrit/client/changes/PatchSetPanel.java | 24 +- .../gerrit/client/changes/PatchTable.java | 6 +- .../client/changes/PublishCommentScreen.java | 21 +- .../client/changes/SubmitFailureDialog.java | 4 +- .../google/gerrit/client/changes/Util.java | 5 +- .../com/google/gerrit/client/greenCheck.png | Bin .../patches/AbstractPatchContentTable.java | 15 +- .../client/patches/CommentEditorPanel.java | 2 +- .../gerrit/client/patches/HistoryTable.java | 4 +- .../client/patches/PatchBrowserPopup.java | 2 +- .../gerrit/client/patches/PatchConstants.java | 0 .../client/patches/PatchConstants.properties | 0 .../gerrit/client/patches/PatchLine.java | 0 .../gerrit/client/patches/PatchMessages.java | 0 .../client/patches/PatchMessages.properties | 0 .../patches/PatchMessages_en.properties | 0 .../gerrit/client/patches/PatchScreen.java | 28 +- .../gerrit/client/patches/PatchUtil.java | 1 + .../client/patches/SideBySideTable.java | 9 +- .../client/patches/UnifiedDiffTable.java | 15 +- .../java/com/google/gerrit/client/redNot.png | Bin .../gerrit/client/rpc/GerritCallback.java | 4 + .../gerrit/client/rpc/RpcConstants.java | 0 .../gerrit/client/rpc/RpcConstants.properties | 0 .../gerrit/client/rpc/ScreenLoadCallback.java | 1 + .../com/google/gerrit/client/starFilled.gif | Bin .../com/google/gerrit/client/starOpen.gif | Bin .../client/ui/AccountDashboardLink.java | 10 +- .../client/ui/AccountGroupSuggestOracle.java | 2 +- .../gerrit/client/ui/AccountScreen.java | 0 .../client/ui/AccountSuggestOracle.java | 2 +- .../google/gerrit/client/ui/AddMemberBox.java | 0 .../google/gerrit/client/ui/ChangeLink.java | 8 +- .../gerrit/client/ui/CommandMenuItem.java | 0 .../google/gerrit/client/ui/CommentPanel.java | 2 +- .../client/ui/ComplexDisclosurePanel.java | 0 .../gerrit/client/ui/DirectScreenLink.java | 0 .../gerrit/client/ui/ExpandAllCommand.java | 0 .../gerrit/client/ui/FancyFlexTable.java | 0 .../gerrit/client/ui/FancyFlexTableImpl.java | 0 .../client/ui/FancyFlexTableImplIE6.java | 0 .../google/gerrit/client/ui/LinkMenuBar.java | 0 .../google/gerrit/client/ui/LinkMenuItem.java | 0 .../gerrit/client/ui/NavigationTable.java | 0 .../client/ui/NeedsSignInKeyCommand.java | 0 .../google/gerrit/client/ui/PatchLink.java | 8 +- .../google/gerrit/client/ui/ProjectLink.java | 10 +- .../client/ui/ProjectNameSuggestOracle.java | 2 +- .../com/google/gerrit/client/ui/Screen.java | 4 +- .../google/gerrit/client/ui/SmallHeading.java | 0 .../google/gerrit/client/ui/SuggestUtil.java | 1 + .../client/ui/TextSaveButtonListener.java | 0 .../com/google/gerrit/common/Version.java | 4 +- .../java/com/google/gerrit/public/gerrit.css | 0 .../gerrit/public/openidlogin_bg1.cache.gif | Bin gerrit-gwtui/src/main/webapp/WEB-INF/web.xml | 3 + gerrit-httpd/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-httpd/pom.xml | 67 ++ .../google/gerrit/httpd}/CookieBase64.java | 2 +- .../gerrit/httpd}/GerritConfigProvider.java | 18 +- .../com/google/gerrit/httpd}/HtmlDomUtil.java | 13 +- .../httpd}/HttpCanonicalWebUrlProvider.java | 2 +- .../httpd}/HttpCurrentUserProvider.java | 2 +- .../httpd}/HttpIdentifiedUserProvider.java | 4 +- .../gerrit/httpd}/HttpLogoutServlet.java | 2 +- .../gerrit/httpd}/HttpRemotePeerProvider.java | 2 +- .../gerrit/httpd}/RequestCleanupFilter.java | 2 +- .../com/google/gerrit/httpd}/UrlModule.java | 39 +- .../com/google/gerrit/httpd}/WebModule.java | 28 +- .../com/google/gerrit/httpd}/WebSession.java | 10 +- .../gerrit/httpd}/WebSessionManager.java | 4 +- .../httpd/auth/become}/BecomeAnyAccount.html | 0 .../become}/BecomeAnyAccountLoginServlet.java | 14 +- .../httpd/auth/container}/HttpAuthFilter.java | 11 +- .../httpd/auth/container}/HttpAuthModule.java | 4 +- .../auth/container}/HttpLoginServlet.java | 13 +- .../httpd/auth/container}/LoginRedirect.html | 0 .../httpd/auth}/ldap/LdapAuthModule.java | 6 +- .../auth}/ldap/LoginRedirectServlet.java | 12 +- .../auth}/ldap/UserPassAuthServiceImpl.java | 8 +- .../auth}/openid/OpenIdLoginServlet.java | 2 +- .../httpd/auth}/openid/OpenIdModule.java | 7 +- .../httpd/auth}/openid/OpenIdServiceImpl.java | 41 +- .../google/gerrit/httpd/raw}/CatServlet.java | 14 +- .../google/gerrit/httpd/raw}/HostPage.html | 0 .../gerrit/httpd/raw}/HostPageServlet.java | 13 +- .../gerrit/httpd/raw}/LegacyGerrit.html | 0 .../httpd/raw}/LegacyGerritServlet.java | 9 +- .../gerrit/httpd/raw}/PrettifyServlet.java | 2 +- .../gerrit/httpd/raw/SshInfoServlet.java | 41 +- .../gerrit/httpd/raw}/StaticServlet.java | 2 +- .../httpd/rpc}/BaseServiceImplementation.java | 12 +- .../httpd}/rpc/ChangeListServiceImpl.java | 37 +- .../gerrit/httpd/rpc}/GerritJsonServlet.java | 7 +- .../httpd/rpc}/GerritJsonServletProvider.java | 2 +- .../com/google/gerrit/httpd}/rpc/Handler.java | 7 +- .../gerrit/httpd/rpc}/RpcServletModule.java | 4 +- .../gerrit/httpd}/rpc/SuggestServiceImpl.java | 17 +- .../httpd/rpc/SystemInfoServiceImpl.java | 78 ++ .../google/gerrit/httpd}/rpc/UiRpcModule.java | 13 +- .../httpd}/rpc/account/AccountModule.java | 6 +- .../rpc/account/AccountSecurityImpl.java | 61 +- .../rpc/account/AccountServiceImpl.java | 22 +- .../rpc/account/AgreementInfoFactory.java | 16 +- .../rpc/account/ExternalIdDetailFactory.java | 8 +- .../rpc/account/GroupAdminServiceImpl.java | 24 +- .../rpc/account/GroupDetailFactory.java | 14 +- .../httpd}/rpc/account/MyGroupsFactory.java | 6 +- .../rpc/changedetail/AbandonChange.java | 18 +- .../rpc/changedetail/ChangeDetailFactory.java | 36 +- .../changedetail/ChangeDetailServiceImpl.java | 14 +- .../changedetail/ChangeManageServiceImpl.java | 8 +- .../httpd}/rpc/changedetail/ChangeModule.java | 6 +- .../changedetail/PatchSetDetailFactory.java | 20 +- .../PatchSetPublishDetailFactory.java | 32 +- .../httpd}/rpc/changedetail/SubmitAction.java | 24 +- .../gerrit/httpd}/rpc/patch/AddReviewer.java | 24 +- .../rpc/patch/CommentDetailFactory.java | 18 +- .../rpc/patch/PatchDetailServiceImpl.java | 48 +- .../gerrit/httpd}/rpc/patch/PatchModule.java | 6 +- .../httpd}/rpc/patch/PatchScriptBuilder.java | 20 +- .../httpd}/rpc/patch/PatchScriptFactory.java | 28 +- .../gerrit/httpd}/rpc/patch/SaveDraft.java | 16 +- .../gerrit/httpd}/rpc/project/AddBranch.java | 16 +- .../httpd}/rpc/project/AddProjectRight.java | 20 +- .../rpc/project/ChangeProjectSettings.java | 12 +- .../httpd}/rpc/project/DeleteBranches.java | 12 +- .../rpc/project/DeleteProjectRights.java | 10 +- .../httpd}/rpc/project/ListBranches.java | 12 +- .../httpd}/rpc/project/OwnedProjects.java | 14 +- .../rpc/project/ProjectAdminServiceImpl.java | 14 +- .../rpc/project/ProjectDetailFactory.java | 16 +- .../httpd}/rpc/project/ProjectModule.java | 6 +- gerrit-main/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-main/pom.xml | 34 + gerrit-main/src/main/java/Main.java | 29 + .../google/gerrit/main/GerritLauncher.java | 441 +++++++++ gerrit-patch-commonsnet/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-patch-commonsnet/pom.xml | 56 ++ .../commons/net/smtp/AuthSMTPClient.java | 35 +- gerrit-patch-gwtexpui/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-patch-gwtexpui/pom.xml | 47 + .../gwtexpui/safehtml/PrettyFormatter.gwt.xml | 19 + .../safehtml/client/MultiLineStyle.java | 0 .../safehtml/client/PrettyFormatter.java | 0 .../public/prettify20090521/lang-css.js | 0 .../public/prettify20090521/lang-hs.js | 0 .../public/prettify20090521/lang-lisp.js | 0 .../public/prettify20090521/lang-lua.js | 0 .../public/prettify20090521/lang-ml.js | 0 .../public/prettify20090521/lang-proto.js | 0 .../public/prettify20090521/lang-sql.js | 0 .../public/prettify20090521/lang-vb.js | 0 .../public/prettify20090521/lang-wiki.js | 0 .../public/prettify20090521/prettify.css | 0 .../public/prettify20090521/prettify.js | 0 gerrit-patch-jgit/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-patch-jgit/pom.xml | 52 + .../main/java/org/eclipse/jgit/JGit.gwt.xml | 0 .../eclipse/jgit/diff/EditDeserializer.java | 0 .../jgit/diff/Edit_JsonSerializer.java | 0 .../jgit/lib/ObjectIdSerialization.java | 26 +- .../jgit/lib/WindowCacheStatAccessor.java | 0 gerrit-pgm/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ gerrit-pgm/.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-pgm/pom.xml | 51 + .../google/gerrit/pgm/AbstractProgram.java | 1 + .../com/google/gerrit/pgm/CreateSchema.java | 6 +- .../java/com/google/gerrit/pgm/Daemon.java | 8 +- .../java/com/google/gerrit/pgm/Version.java | 35 +- gerrit-reviewdb/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-reviewdb/pom.xml | 41 + .../java/com/google/gerrit/ReviewDB.gwt.xml | 19 + .../gerrit}/reviewdb/AbstractAgreement.java | 2 +- .../com/google/gerrit}/reviewdb/Account.java | 2 +- .../gerrit}/reviewdb/AccountAccess.java | 2 +- .../gerrit}/reviewdb/AccountAgreement.java | 2 +- .../reviewdb/AccountAgreementAccess.java | 2 +- .../gerrit}/reviewdb/AccountExternalId.java | 2 +- .../reviewdb/AccountExternalIdAccess.java | 2 +- .../reviewdb/AccountGeneralPreferences.java | 2 +- .../google/gerrit}/reviewdb/AccountGroup.java | 2 +- .../gerrit}/reviewdb/AccountGroupAccess.java | 2 +- .../reviewdb/AccountGroupAgreement.java | 2 +- .../reviewdb/AccountGroupAgreementAccess.java | 2 +- .../gerrit}/reviewdb/AccountGroupMember.java | 2 +- .../reviewdb/AccountGroupMemberAccess.java | 2 +- .../reviewdb/AccountGroupMemberAudit.java | 2 +- .../AccountGroupMemberAuditAccess.java | 2 +- .../gerrit}/reviewdb/AccountPatchReview.java | 2 +- .../reviewdb/AccountPatchReviewAccess.java | 2 +- .../gerrit}/reviewdb/AccountProjectWatch.java | 2 +- .../reviewdb/AccountProjectWatchAccess.java | 2 +- .../gerrit}/reviewdb/AccountSshKey.java | 2 +- .../gerrit}/reviewdb/AccountSshKeyAccess.java | 2 +- .../gerrit}/reviewdb/ApprovalCategory.java | 2 +- .../reviewdb/ApprovalCategoryAccess.java | 2 +- .../reviewdb/ApprovalCategoryValue.java | 2 +- .../reviewdb/ApprovalCategoryValueAccess.java | 2 +- .../com/google/gerrit}/reviewdb/AuthType.java | 2 +- .../com/google/gerrit}/reviewdb/Branch.java | 2 +- .../com/google/gerrit}/reviewdb/Change.java | 2 +- .../google/gerrit}/reviewdb/ChangeAccess.java | 2 +- .../gerrit}/reviewdb/ChangeMessage.java | 2 +- .../gerrit}/reviewdb/ChangeMessageAccess.java | 2 +- .../google/gerrit/reviewdb}/CodedEnum.java | 2 +- .../gerrit}/reviewdb/ContactInformation.java | 2 +- .../reviewdb/ContributorAgreement.java | 2 +- .../reviewdb/ContributorAgreementAccess.java | 2 +- .../com/google/gerrit}/reviewdb/Patch.java | 18 +- .../gerrit}/reviewdb/PatchLineComment.java | 2 +- .../reviewdb/PatchLineCommentAccess.java | 2 +- .../com/google/gerrit}/reviewdb/PatchSet.java | 2 +- .../gerrit}/reviewdb/PatchSetAccess.java | 2 +- .../gerrit}/reviewdb/PatchSetAncestor.java | 2 +- .../reviewdb/PatchSetAncestorAccess.java | 2 +- .../gerrit}/reviewdb/PatchSetApproval.java | 2 +- .../reviewdb/PatchSetApprovalAccess.java | 2 +- .../google/gerrit}/reviewdb/PatchSetInfo.java | 4 +- .../com/google/gerrit}/reviewdb/Project.java | 2 +- .../gerrit}/reviewdb/ProjectAccess.java | 2 +- .../google/gerrit}/reviewdb/ProjectRight.java | 2 +- .../gerrit}/reviewdb/ProjectRightAccess.java | 2 +- .../com/google/gerrit}/reviewdb/RevId.java | 2 +- .../com/google/gerrit}/reviewdb/ReviewDb.java | 2 +- .../gerrit}/reviewdb/SchemaVersion.java | 2 +- .../gerrit}/reviewdb/SchemaVersionAccess.java | 2 +- .../gerrit}/reviewdb/StarredChange.java | 2 +- .../gerrit}/reviewdb/StarredChangeAccess.java | 2 +- .../google/gerrit}/reviewdb/SystemConfig.java | 2 +- .../gerrit}/reviewdb/SystemConfigAccess.java | 2 +- .../google/gerrit}/reviewdb/UserIdentity.java | 2 +- gerrit-server/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-server/pom.xml | 131 +++ .../com/google/gerrit/server/query/Query.g | 0 .../com/google/gerrit/common/Version.java | 52 + .../com/google/gerrit/server/AccessPath.java | 0 .../google/gerrit/server/AnonymousUser.java | 4 +- .../com/google/gerrit/server/ChangeUtil.java | 4 +- .../com/google/gerrit/server/CurrentUser.java | 4 +- .../gerrit/server/FileTypeRegistry.java | 0 .../gerrit/server/GerritPersonIdent.java | 0 .../server/GerritPersonIdentProvider.java | 0 .../google/gerrit/server/IdentifiedUser.java | 10 +- .../server/MimeUtilFileTypeRegistry.java | 0 .../gerrit/server/ParamertizedString.java | 0 .../com/google/gerrit/server/RemotePeer.java | 0 .../google/gerrit/server/ReplicationUser.java | 4 +- .../google/gerrit/server/RequestCleanup.java | 0 .../com/google/gerrit/server/UrlEncoded.java | 0 .../server/account/AccountByEmailCache.java | 2 +- .../account/AccountByEmailCacheImpl.java | 6 +- .../gerrit/server/account/AccountCache.java | 2 +- .../server/account/AccountCacheImpl.java | 10 +- .../server/account/AccountException.java | 0 .../account/AccountInfoCacheFactory.java | 6 +- .../gerrit/server/account/AccountManager.java | 12 +- .../server/account/AccountResolver.java | 4 +- .../gerrit/server/account/AccountState.java | 6 +- .../gerrit/server/account/AuthRequest.java | 4 +- .../gerrit/server/account/AuthResult.java | 2 +- .../gerrit/server/account/DefaultRealm.java | 4 +- .../gerrit/server/account/EmailExpander.java | 0 .../gerrit/server/account/GroupCache.java | 2 +- .../gerrit/server/account/GroupCacheImpl.java | 4 +- .../gerrit/server/account/GroupControl.java | 4 +- .../server/account/NoSuchGroupException.java | 2 +- .../google/gerrit/server/account/Realm.java | 4 +- .../gerrit/server/auth}/ldap/LdapModule.java | 6 +- .../gerrit/server/auth}/ldap/LdapQuery.java | 2 +- .../gerrit/server/auth}/ldap/LdapRealm.java | 14 +- .../gerrit/server/auth}/ldap/LdapType.java | 2 +- .../gerrit/server/auth}/ldap/SearchScope.java | 2 +- .../com/google/gerrit/server/cache/Cache.java | 0 .../gerrit/server/cache/CacheModule.java | 0 .../google/gerrit/server/cache/CachePool.java | 0 .../gerrit/server/cache/CacheProvider.java | 0 .../gerrit/server/cache/EvictionPolicy.java | 0 .../server/cache/NamedCacheBinding.java | 0 .../gerrit/server/cache/ProxyEhcache.java | 0 .../server/cache/SelfPopulatingCache.java | 0 .../gerrit/server/cache/SimpleCache.java | 0 .../server/cache/UnnamedCacheBinding.java | 0 .../server/config/ApprovalTypesProvider.java | 10 +- .../gerrit/server/config/AuthConfig.java | 8 +- .../gerrit/server/config/CanonicalWebUrl.java | 0 .../server/config/CanonicalWebUrlModule.java | 0 .../config/CanonicalWebUrlProvider.java | 0 .../gerrit/server/config/ConfigUtil.java | 0 .../gerrit/server/config/DatabaseModule.java | 4 +- .../server/config/EmailExpanderProvider.java | 0 .../gerrit/server/config/FactoryModule.java | 0 .../server/config/GerritConfigModule.java | 2 +- .../server/config/GerritGlobalModule.java | 28 +- .../server/config/GerritRequestModule.java | 2 +- .../server/config/GerritServerConfig.java | 0 .../config/GerritServerConfigProvider.java | 0 .../google/gerrit/server/config/Nullable.java | 0 .../config/RequestScopedReviewDbProvider.java | 2 +- .../config/ReviewDbDataSourceProvider.java | 0 .../config/ReviewDbDatabaseProvider.java | 2 +- .../google/gerrit/server/config/SitePath.java | 0 .../server/config/SitePathProvider.java | 2 +- .../server/config/SystemConfigProvider.java | 16 +- .../gerrit/server/config/WildProjectName.java | 2 +- .../config/WildProjectNameProvider.java | 6 +- .../gerrit/server/contact/ContactStore.java | 6 +- .../server/contact/ContactStoreProvider.java | 2 +- .../server/contact/EncryptedContactStore.java | 10 +- .../gerrit/server/contact/NoContactStore.java | 6 +- .../gerrit/server}/git/ChangeMergeQueue.java | 6 +- .../gerrit/server}/git/CodeReviewCommit.java | 6 +- .../gerrit/server}/git/CommitMergeStatus.java | 2 +- .../gerrit/server}/git/DefaultQueueOp.java | 2 +- .../server}/git/GitRepositoryManager.java | 2 +- .../gerrit/server}/git/MergeException.java | 2 +- .../google/gerrit/server}/git/MergeOp.java | 26 +- .../google/gerrit/server}/git/MergeQueue.java | 4 +- .../gerrit/server}/git/MergeSorter.java | 2 +- .../gerrit/server}/git/PatchSetImporter.java | 12 +- .../gerrit/server}/git/PushAllProjectsOp.java | 8 +- .../com/google/gerrit/server}/git/PushOp.java | 2 +- .../gerrit/server}/git/PushReplication.java | 8 +- .../server}/git/ReloadSubmitQueueOp.java | 8 +- .../gerrit/server}/git/ReplicationQueue.java | 4 +- .../google/gerrit/server}/git/WorkQueue.java | 2 +- .../server/ioutil/BasicSerialization.java | 2 +- .../gerrit/server/mail/AbandonedSender.java | 2 +- .../gerrit/server/mail/AddReviewerSender.java | 2 +- .../google/gerrit/server/mail/Address.java | 0 .../gerrit/server/mail/CommentSender.java | 6 +- .../server/mail/CreateChangeSender.java | 10 +- .../gerrit/server/mail/EmailException.java | 0 .../gerrit/server/mail/EmailHeader.java | 0 .../gerrit/server/mail/EmailSender.java | 0 .../server/mail/FromAddressGenerator.java | 2 +- .../mail/FromAddressGeneratorProvider.java | 2 +- .../gerrit/server/mail/MergeFailSender.java | 2 +- .../gerrit/server/mail/MergedSender.java | 18 +- .../gerrit/server/mail/NewChangeSender.java | 20 +- .../gerrit/server/mail/OutgoingEmail.java | 24 +- .../gerrit/server/mail/RecipientType.java | 0 .../server/mail/RegisterNewEmailSender.java | 0 .../server/mail/ReplacePatchSetSender.java | 20 +- .../server/mail/ReplyToChangeSender.java | 2 +- .../gerrit/server/mail/SmtpEmailSender.java | 2 +- .../google/gerrit/server/patch/PatchFile.java | 6 +- .../google/gerrit/server/patch/PatchList.java | 4 +- .../gerrit/server/patch/PatchListCache.java | 6 +- .../server/patch/PatchListCacheImpl.java | 12 +- .../gerrit/server/patch/PatchListEntry.java | 8 +- .../gerrit/server/patch/PatchListKey.java | 4 +- .../server/patch/PatchSetInfoFactory.java | 16 +- .../PatchSetInfoNotAvailableException.java | 0 .../com/google/gerrit/server/patch/Text.java | 2 +- .../gerrit/server/project/ChangeControl.java | 6 +- .../server/project/NoSuchChangeException.java | 2 +- .../project/NoSuchProjectException.java | 2 +- .../gerrit/server/project/ProjectCache.java | 2 +- .../server/project/ProjectCacheImpl.java | 6 +- .../gerrit/server/project/ProjectControl.java | 18 +- .../gerrit/server/project/ProjectState.java | 8 +- .../gerrit/server/query/AndPredicate.java | 0 .../server/query/ChangeQueryBuilder.java | 2 +- .../gerrit/server/query/NotPredicate.java | 0 .../server/query/ObjectIdPredicate.java | 0 .../server/query/OperatorPredicate.java | 0 .../gerrit/server/query/OrPredicate.java | 0 .../google/gerrit/server/query/Predicate.java | 0 .../gerrit/server/query/QueryBuilder.java | 0 .../server/query/QueryParseException.java | 0 .../com/google/gerrit/server/ssh/SshInfo.java | 12 +- .../google/gerrit/server/ssh/SshKeyCache.java | 10 +- .../server/workflow/CategoryFunction.java | 8 +- .../gerrit/server/workflow/FunctionState.java | 22 +- .../gerrit/server/workflow/MaxWithBlock.java | 6 +- .../gerrit/server/workflow/NoOpFunction.java | 2 +- .../server/workflow/SubmitFunction.java | 8 +- .../gerrit/server/ParamertizedStringTest.java | 0 .../config/SystemConfigProviderTest.java | 16 +- .../server/ioutil/BasicSerializationTest.java | 0 .../gerrit/server/mail/AddressTest.java | 0 .../FromAddressGeneratorProviderTest.java | 6 +- .../server/patch/PatchListEntryTest.java | 2 +- .../server/query/ChangeQueryBuilderTest.java | 0 .../server/query/FieldPredicateTest.java | 0 .../gerrit/server/query/NotPredicateTest.java | 0 .../gerrit/server/query/QueryParserTest.java | 0 .../google/gerrit/testutil/TestDatabase.java | 2 +- gerrit-sshd/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-sshd/pom.xml | 61 ++ .../com/google/gerrit/sshd}/AdminCommand.java | 2 +- .../com/google/gerrit/sshd}/BaseCommand.java | 8 +- .../gerrit/sshd}/CommandFactoryProvider.java | 4 +- .../google/gerrit/sshd}/CommandModule.java | 2 +- .../com/google/gerrit/sshd}/CommandName.java | 2 +- .../com/google/gerrit/sshd}/Commands.java | 2 +- .../gerrit/sshd}/DatabasePubKeyAuth.java | 10 +- .../google/gerrit/sshd}/DispatchCommand.java | 2 +- .../gerrit/sshd}/DispatchCommandProvider.java | 2 +- .../google/gerrit/sshd}/HostKeyProvider.java | 2 +- .../java/com/google/gerrit/sshd}/NoShell.java | 10 +- .../gerrit/sshd}/SshCurrentUserProvider.java | 6 +- .../com/google/gerrit/sshd}/SshDaemon.java | 116 +-- .../google/gerrit/sshd}/SshKeyCacheEntry.java | 8 +- .../google/gerrit/sshd}/SshKeyCacheImpl.java | 36 +- .../com/google/gerrit/sshd}/SshModule.java | 26 +- .../com/google/gerrit/sshd}/SshScopes.java | 2 +- .../java/com/google/gerrit/sshd}/SshUtil.java | 6 +- .../sshd}/args4j/AccountGroupIdHandler.java | 4 +- .../gerrit/sshd}/args4j/AccountIdHandler.java | 4 +- .../sshd}/args4j/PatchSetIdHandler.java | 4 +- .../sshd}/args4j/ProjectControlHandler.java | 4 +- .../sshd}/commands/AbstractGitCommand.java | 8 +- .../sshd}/commands/AdminCreateProject.java | 22 +- .../sshd}/commands/AdminFlushCaches.java | 4 +- .../gerrit/sshd}/commands/AdminReplicate.java | 12 +- .../sshd}/commands/AdminShowCaches.java | 4 +- .../sshd}/commands/AdminShowConnections.java | 12 +- .../gerrit/sshd}/commands/AdminShowQueue.java | 10 +- .../gerrit/sshd}/commands/ApproveCommand.java | 26 +- .../gerrit/sshd}/commands/ApproveOption.java | 8 +- .../gerrit/sshd}/commands/CacheCommand.java | 4 +- .../sshd}/commands/DefaultCommandModule.java | 10 +- .../gerrit/sshd}/commands/ErrorSlaveMode.java | 4 +- .../gerrit/sshd}/commands/ListProjects.java | 8 +- .../sshd}/commands/MasterCommandModule.java | 8 +- .../google/gerrit/sshd}/commands/Receive.java | 60 +- .../gerrit/sshd}/commands/ScpCommand.java | 8 +- .../sshd}/commands/SlaveCommandModule.java | 8 +- .../google/gerrit/sshd}/commands/Upload.java | 2 +- .../java/com/google/gerrit/sshd}/scproot/TOC | 0 .../sshd}/scproot/bin/gerrit-cherry-pick | 0 .../gerrit/sshd}/scproot/hooks/commit-msg | 0 .../scproot/hooks/CommitMsgHookTest.java | 2 +- .../sshd}/scproot/hooks/HookTestCase.java | 4 +- .../testutil/LocalDiskRepositoryTestCase.java | 0 .../gerrit/testutil/MockSystemReader.java | 0 gerrit-util-cli/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-util-cli/pom.xml | 51 + .../gerrit/util/cli}/CmdLineParser.java | 2 +- .../util/cli}/OptionHandlerFactory.java | 2 +- .../gerrit/util/cli}/OptionHandlerUtil.java | 2 +- gerrit-util-ssl/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-util-ssl/pom.xml | 34 + .../util/ssl}/BlindSSLSocketFactory.java | 2 +- gerrit-war/.gitignore | 4 + .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 268 ++++++ gerrit-war/.settings/org.eclipse.jdt.ui.prefs | 61 ++ gerrit-war/pom.xml | 150 +++ .../gerrit/httpd/WebAppInitializer.java | 18 +- .../src}/main/java/log4j.properties | 0 .../extra}/GerritServer.properties_example | 0 .../WEB-INF/extra/jetty6/gerrit-jetty.sh | 0 .../webapp/WEB-INF/extra/jetty6/gerrit.xml | 0 .../WEB-INF/extra/jetty6/jetty_sslproxy.xml | 0 .../WEB-INF/extra/jetty7/gerrit-jetty.sh | 0 .../webapp/WEB-INF/extra/jetty7/gerrit.xml | 0 .../WEB-INF/extra/jetty7/jetty_sslproxy.xml | 0 .../main/webapp/WEB-INF/sql/index_generic.sql | 0 .../webapp/WEB-INF/sql/index_postgres.sql | 0 .../main/webapp/WEB-INF/sql/mysql_nextval.sql | 0 .../webapp/WEB-INF/sql/upgrade003_004.sql | 0 .../WEB-INF/sql/upgrade004_005_part1.sql | 0 .../WEB-INF/sql/upgrade004_005_part2.sql | 0 .../webapp/WEB-INF/sql/upgrade005_006.sql | 0 .../webapp/WEB-INF/sql/upgrade006_007.sql | 0 .../webapp/WEB-INF/sql/upgrade007_008.sql | 0 .../webapp/WEB-INF/sql/upgrade008_009.sql | 0 .../webapp/WEB-INF/sql/upgrade009_010.sql | 0 .../webapp/WEB-INF/sql/upgrade010_011.sql | 0 .../WEB-INF/sql/upgrade011_012_part1.sql | 0 .../WEB-INF/sql/upgrade011_012_part2.sql | 0 .../WEB-INF/sql/upgrade012_013_mysql.sql | 0 .../WEB-INF/sql/upgrade012_013_postgres.sql | 0 .../WEB-INF/sql/upgrade013_014_mysql.sql | 0 .../WEB-INF/sql/upgrade013_014_postgres.sql | 0 .../sql/upgrade014_015_part1_mysql.sql | 0 .../sql/upgrade014_015_part1_postgres.sql | 0 .../WEB-INF/sql/upgrade014_015_part2.sql | 0 .../sql/upgrade015_016_part1_mysql.sql | 0 .../sql/upgrade015_016_part1_postgres.sql | 0 .../WEB-INF/sql/upgrade015_016_part2.sql | 0 .../WEB-INF/sql/upgrade016_017_mysql.sql | 0 .../WEB-INF/sql/upgrade016_017_postgres.sql | 0 .../WEB-INF/sql/upgrade017_018_mysql.sql | 0 .../WEB-INF/sql/upgrade017_018_postgres.sql | 0 .../WEB-INF/sql/upgrade018_019_mysql.sql | 0 .../WEB-INF/sql/upgrade018_019_postgres.sql | 0 .../src}/main/webapp/WEB-INF/web.xml | 2 +- .../src}/main/webapp/favicon.ico | Bin .../src}/main/webapp/robots.txt | 0 gerrit_debug.launch | 27 - gerrit_macos.launch | 27 - pom.xml | 887 ++++++++++-------- .../server/rpc/SystemInfoServiceImpl.java | 159 ---- src/main/webapp/WEB-INF/web-jetty.xml | 8 - to_hosted.sh | 4 - GoogleFormat.xml => tools/GoogleFormat.xml | 0 tools/gwtui_any.launch | 36 + tools/gwtui_mac.launch | 36 + tools/pgm_daemon.launch | 20 + to_jetty.sh => tools/to_jetty.sh | 5 +- 719 files changed, 9467 insertions(+), 2417 deletions(-) create mode 100644 gerrit-common/.gitignore rename {.settings => gerrit-common/.settings}/org.eclipse.core.resources.prefs (100%) rename {.settings => gerrit-common/.settings}/org.eclipse.core.runtime.prefs (100%) rename {.settings => gerrit-common/.settings}/org.eclipse.jdt.core.prefs (100%) rename {.settings => gerrit-common/.settings}/org.eclipse.jdt.ui.prefs (100%) create mode 100644 gerrit-common/pom.xml create mode 100644 gerrit-common/src/main/java/com/google/gerrit/Common.gwt.xml create mode 100644 gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java create mode 100644 gerrit-common/src/main/java/com/google/gerrit/common/auth/SignInMode.java rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/auth}/SignInRequired.java (86%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/auth/openid/DiscoveryResult.java (95%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/auth/openid/OpenIdService.java (85%) create mode 100644 gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/auth/userpass/LoginResult.java (93%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/auth/userpass/UserPassAuthService.java (95%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/AccountDashboardInfo.java (87%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/AccountInfo.java (95%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/AccountInfoCache.java (96%) rename {src/main/java/com/google/gerrit/client/account => gerrit-common/src/main/java/com/google/gerrit/common/data}/AccountProjectWatchInfo.java (86%) rename {src/main/java/com/google/gerrit/client/account => gerrit-common/src/main/java/com/google/gerrit/common/data}/AccountSecurity.java (81%) rename {src/main/java/com/google/gerrit/client/account => gerrit-common/src/main/java/com/google/gerrit/common/data}/AccountService.java (85%) rename {src/main/java/com/google/gerrit/client/patches => gerrit-common/src/main/java/com/google/gerrit/common/data}/AddReviewerResult.java (95%) rename {src/main/java/com/google/gerrit/client/account => gerrit-common/src/main/java/com/google/gerrit/common/data}/AgreementInfo.java (71%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/ApprovalDetail.java (91%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/ApprovalSummary.java (89%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/ApprovalSummarySet.java (94%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/ApprovalType.java (93%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/ApprovalTypes.java (95%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/ChangeDetail.java (92%) rename {src/main/java/com/google/gerrit/client/changes => gerrit-common/src/main/java/com/google/gerrit/common/data}/ChangeDetailService.java (78%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/ChangeInfo.java (93%) rename {src/main/java/com/google/gerrit/client/changes => gerrit-common/src/main/java/com/google/gerrit/common/data}/ChangeListService.java (89%) rename {src/main/java/com/google/gerrit/client/changes => gerrit-common/src/main/java/com/google/gerrit/common/data}/ChangeManageService.java (83%) rename {src/main/java/com/google/gerrit/client/patches => gerrit-common/src/main/java/com/google/gerrit/common/data}/CommentDetail.java (95%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/EditList.java (99%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/GerritConfig.java (94%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/GitwebLink.java (92%) rename {src/main/java/com/google/gerrit/client/admin => gerrit-common/src/main/java/com/google/gerrit/common/data}/GroupAdminService.java (91%) rename {src/main/java/com/google/gerrit/client/admin => gerrit-common/src/main/java/com/google/gerrit/common/data}/GroupDetail.java (72%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common/data}/HostPageData.java (85%) rename {src/main/java/com/google/gerrit/client/patches => gerrit-common/src/main/java/com/google/gerrit/common/data}/PatchDetailService.java (76%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/PatchScript.java (93%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/PatchScriptSettings.java (91%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/PatchSetDetail.java (85%) rename {src/main/java/com/google/gerrit/client/changes => gerrit-common/src/main/java/com/google/gerrit/common/data}/PatchSetPublishDetail.java (84%) rename {src/main/java/com/google/gerrit/client/admin => gerrit-common/src/main/java/com/google/gerrit/common/data}/ProjectAdminService.java (86%) rename {src/main/java/com/google/gerrit/client/admin => gerrit-common/src/main/java/com/google/gerrit/common/data}/ProjectDetail.java (74%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/ProjectInfo.java (90%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/SingleListChangeInfo.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/SparseFileContent.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/SshHostKey.java (97%) rename {src/main/java/com/google/gerrit/client/ui => gerrit-common/src/main/java/com/google/gerrit/common/data}/SuggestService.java (85%) rename {src/main/java/com/google/gerrit/client => gerrit-common/src/main/java/com/google/gerrit/common}/data/SystemInfoService.java (87%) rename {src/main/java/com/google/gerrit/client/changes => gerrit-common/src/main/java/com/google/gerrit/common/data}/ToggleStarRequest.java (95%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/errors}/ContactInformationStoreException.java (96%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/errors}/CorruptEntityException.java (96%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/errors}/InvalidNameException.java (95%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/errors}/InvalidRevisionException.java (95%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/errors}/InvalidSshKeyException.java (95%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/errors}/InvalidSshUserNameException.java (91%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/errors}/NameAlreadyUsedException.java (95%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/errors}/NoSuchAccountException.java (95%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/errors}/NoSuchEntityException.java (95%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-common/src/main/java/com/google/gerrit/common/errors}/NotSignedInException.java (95%) create mode 100644 gerrit-gwtdebug/.gitignore create mode 100644 gerrit-gwtdebug/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-gwtdebug/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-gwtdebug/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-gwtdebug/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-gwtdebug/pom.xml create mode 100644 gerrit-gwtdebug/src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java create mode 100644 gerrit-gwtui/.gitignore create mode 100644 gerrit-gwtui/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-gwtui/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-gwtui/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-gwtui/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-gwtui/pom.xml rename src/main/java/com/google/gerrit/Gerrit.gwt.xml => gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml (89%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/UserAgent.gwt.xml (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ErrorDialog.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/FormatUtil.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/Gerrit.java (90%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/GerritConstants.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/GerritConstants.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/GerritIcons.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/GerritMessages.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/GerritMessages.properties (100%) rename src/main/java/com/google/gerrit/client/Link.java => gerrit-gwtui/src/main/java/com/google/gerrit/client/HistoryHandler.java (79%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/HostPageDataService.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/JumpKeys.java (87%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/NotFoundScreen.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/NotSignedInDialog.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/RpcStatus.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/SearchPanel.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/SignInDialog.java (89%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/AccountConstants.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/AccountConstants.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/AccountMessages.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/AccountMessages.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/AccountSettings.java (91%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/AgreementPanel.java (91%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/ContactPanelFull.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/ContactPanelShort.java (98%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/ExternalIdPanel.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/MyGroupsPanel.java (96%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/NewAgreementScreen.java (96%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/PreferencePanel.java (91%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java (98%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/RegisterScreen.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/SshPanel.java (98%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/Util.java (92%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java (93%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java (98%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/AdminConstants.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/AdminConstants.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/AdminMessages.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/AdminMessages.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/GroupListScreen.java (90%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/GroupTable.java (92%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java (89%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java (98%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/ProjectListScreen.java (93%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/admin/Util.java (91%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/arrowRight.gif (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/openid/LoginConstants.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/openid/LoginConstants.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/openid/LoginIcons.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/openid/LoginMessages.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/openid/LoginMessages.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/openid/OpenIdUtil.java (61%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/openid/iconGoogle.gif (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/openid/iconYahoo.gif (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/openid/openidLogo.png (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/userpass/LoginConstants.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/userpass/LoginConstants.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/userpass/LoginMessages.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/userpass/LoginMessages.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/userpass/UserPassSignInDialog.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/auth/userpass/Util.java (94%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/AbandonChangeDialog.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java (91%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java (96%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java (96%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java (96%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ApprovalTable.java (94%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ByProjectAbandonedChangesScreen.java (93%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ByProjectMergedChangesScreen.java (93%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java (96%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ChangeConstants.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ChangeConstants.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java (92%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java (96%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ChangeMessages.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ChangeMessages.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ChangeQueryResultsScreen.java (90%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ChangeScreen.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/ChangeTable.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/MessagePanel.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java (93%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java (96%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/MineStarredScreen.java (93%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/PatchSetPanel.java (94%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/PatchTable.java (99%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java (94%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/SubmitFailureDialog.java (94%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/changes/Util.java (89%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/greenCheck.png (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java (99%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/HistoryTable.java (98%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/PatchBrowserPopup.java (98%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/PatchConstants.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/PatchConstants.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/PatchLine.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/PatchMessages.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/PatchMessages.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/PatchScreen.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/PatchUtil.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/SideBySideTable.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java (96%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/redNot.png (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/rpc/GerritCallback.java (92%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/rpc/RpcConstants.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/rpc/RpcConstants.properties (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java (95%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/starFilled.gif (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/starOpen.gif (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java (87%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/AccountScreen.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/AddMemberBox.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/ChangeLink.java (88%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/CommandMenuItem.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/CommentPanel.java (99%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/DirectScreenLink.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/FancyFlexTable.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/LinkMenuBar.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/LinkMenuItem.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/NavigationTable.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/NeedsSignInKeyCommand.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/PatchLink.java (87%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/ProjectLink.java (87%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java (97%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/Screen.java (96%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/SmallHeading.java (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/SuggestUtil.java (94%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java (100%) rename src/main/java/com/google/gerrit/client/GerritVersion.java => gerrit-gwtui/src/main/java/com/google/gerrit/common/Version.java (90%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/public/gerrit.css (100%) rename {src => gerrit-gwtui/src}/main/java/com/google/gerrit/public/openidlogin_bg1.cache.gif (100%) create mode 100644 gerrit-gwtui/src/main/webapp/WEB-INF/web.xml create mode 100644 gerrit-httpd/.gitignore create mode 100644 gerrit-httpd/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-httpd/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-httpd/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-httpd/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-httpd/pom.xml rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/CookieBase64.java (98%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/GerritConfigProvider.java (89%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/HtmlDomUtil.java (94%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/HttpCanonicalWebUrlProvider.java (98%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/HttpCurrentUserProvider.java (96%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/HttpIdentifiedUserProvider.java (93%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/HttpLogoutServlet.java (97%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/HttpRemotePeerProvider.java (97%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/RequestCleanupFilter.java (97%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/UrlModule.java (73%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/WebModule.java (76%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/WebSession.java (95%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/WebSessionManager.java (98%) rename {src/main/webapp/WEB-INF => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become}/BecomeAnyAccount.html (100%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become}/BecomeAnyAccountLoginServlet.java (92%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container}/HttpAuthFilter.java (90%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container}/HttpAuthModule.java (89%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container}/HttpLoginServlet.java (95%) rename {src/main/webapp/WEB-INF => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container}/LoginRedirect.html (100%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth}/ldap/LdapAuthModule.java (88%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth}/ldap/LoginRedirectServlet.java (89%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth}/ldap/UserPassAuthServiceImpl.java (90%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth}/openid/OpenIdLoginServlet.java (97%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth}/openid/OpenIdModule.java (89%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth}/openid/OpenIdServiceImpl.java (93%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw}/CatServlet.java (96%) rename {src/main/webapp/WEB-INF => gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw}/HostPage.html (100%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw}/HostPageServlet.java (95%) rename {src/main/webapp/WEB-INF => gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw}/LegacyGerrit.html (100%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw}/LegacyGerritServlet.java (90%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw}/PrettifyServlet.java (98%) rename src/main/java/com/google/gerrit/server/http/SshServlet.java => gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java (77%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw}/StaticServlet.java (99%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc}/BaseServiceImplementation.java (92%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/ChangeListServiceImpl.java (95%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc}/GerritJsonServlet.java (94%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc}/GerritJsonServletProvider.java (97%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/Handler.java (93%) rename {src/main/java/com/google/gerrit/server/http => gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc}/RpcServletModule.java (94%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/SuggestServiceImpl.java (90%) create mode 100644 gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/UiRpcModule.java (73%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/account/AccountModule.java (89%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/account/AccountSecurityImpl.java (87%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/account/AccountServiceImpl.java (90%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/account/AgreementInfoFactory.java (84%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/account/ExternalIdDetailFactory.java (88%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/account/GroupAdminServiceImpl.java (95%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/account/GroupDetailFactory.java (90%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/account/MyGroupsFactory.java (92%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/changedetail/AbandonChange.java (91%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/changedetail/ChangeDetailFactory.java (89%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/changedetail/ChangeDetailServiceImpl.java (82%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/changedetail/ChangeManageServiceImpl.java (87%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/changedetail/ChangeModule.java (89%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/changedetail/PatchSetDetailFactory.java (88%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/changedetail/PatchSetPublishDetailFactory.java (85%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/changedetail/SubmitAction.java (88%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/patch/AddReviewer.java (89%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/patch/CommentDetailFactory.java (90%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/patch/PatchDetailServiceImpl.java (92%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/patch/PatchModule.java (88%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/patch/PatchScriptBuilder.java (95%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/patch/PatchScriptFactory.java (90%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/patch/SaveDraft.java (89%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/project/AddBranch.java (93%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/project/AddProjectRight.java (89%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/project/ChangeProjectSettings.java (89%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/project/DeleteBranches.java (92%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/project/DeleteProjectRights.java (91%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/project/ListBranches.java (92%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/project/OwnedProjects.java (87%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/project/ProjectAdminServiceImpl.java (91%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/project/ProjectDetailFactory.java (90%) rename {src/main/java/com/google/gerrit/server => gerrit-httpd/src/main/java/com/google/gerrit/httpd}/rpc/project/ProjectModule.java (90%) create mode 100644 gerrit-main/.gitignore create mode 100644 gerrit-main/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-main/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-main/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-main/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-main/pom.xml create mode 100644 gerrit-main/src/main/java/Main.java create mode 100644 gerrit-main/src/main/java/com/google/gerrit/main/GerritLauncher.java create mode 100644 gerrit-patch-commonsnet/.gitignore create mode 100644 gerrit-patch-commonsnet/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-patch-commonsnet/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-patch-commonsnet/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-patch-commonsnet/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-patch-commonsnet/pom.xml rename {src => gerrit-patch-commonsnet/src}/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java (84%) create mode 100644 gerrit-patch-gwtexpui/.gitignore create mode 100644 gerrit-patch-gwtexpui/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-patch-gwtexpui/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-patch-gwtexpui/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-patch-gwtexpui/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-patch-gwtexpui/pom.xml create mode 100644 gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/PrettyFormatter.gwt.xml rename {src => gerrit-patch-gwtexpui/src}/main/java/com/google/gwtexpui/safehtml/client/MultiLineStyle.java (100%) rename {src => gerrit-patch-gwtexpui/src}/main/java/com/google/gwtexpui/safehtml/client/PrettyFormatter.java (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/lang-css.js (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/lang-hs.js (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/lang-lisp.js (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/lang-lua.js (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/lang-ml.js (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/lang-proto.js (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/lang-sql.js (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/lang-vb.js (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/lang-wiki.js (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/prettify.css (100%) rename {src/main/java/com/google/gerrit => gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml}/public/prettify20090521/prettify.js (100%) create mode 100644 gerrit-patch-jgit/.gitignore create mode 100644 gerrit-patch-jgit/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-patch-jgit/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-patch-jgit/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-patch-jgit/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-patch-jgit/pom.xml rename {src => gerrit-patch-jgit/src}/main/java/org/eclipse/jgit/JGit.gwt.xml (100%) rename {src => gerrit-patch-jgit/src}/main/java/org/eclipse/jgit/diff/EditDeserializer.java (100%) rename {src => gerrit-patch-jgit/src}/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java (100%) rename {src => gerrit-patch-jgit/src}/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java (64%) rename {src => gerrit-patch-jgit/src}/main/java/org/eclipse/jgit/lib/WindowCacheStatAccessor.java (100%) create mode 100644 gerrit-pgm/.gitignore create mode 100644 gerrit-pgm/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-pgm/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-pgm/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-pgm/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-pgm/pom.xml rename {src => gerrit-pgm/src}/main/java/com/google/gerrit/pgm/AbstractProgram.java (98%) rename {src => gerrit-pgm/src}/main/java/com/google/gerrit/pgm/CreateSchema.java (92%) rename {src => gerrit-pgm/src}/main/java/com/google/gerrit/pgm/Daemon.java (88%) rename {src => gerrit-pgm/src}/main/java/com/google/gerrit/pgm/Version.java (54%) create mode 100644 gerrit-reviewdb/.gitignore create mode 100644 gerrit-reviewdb/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-reviewdb/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-reviewdb/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-reviewdb/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-reviewdb/pom.xml create mode 100644 gerrit-reviewdb/src/main/java/com/google/gerrit/ReviewDB.gwt.xml rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AbstractAgreement.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/Account.java (99%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountAccess.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountAgreement.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountAgreementAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountExternalId.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountExternalIdAccess.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountGeneralPreferences.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountGroup.java (99%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountGroupAccess.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountGroupAgreement.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountGroupAgreementAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountGroupMember.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountGroupMemberAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountGroupMemberAudit.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountGroupMemberAuditAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountPatchReview.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountPatchReviewAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountProjectWatch.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountProjectWatchAccess.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountSshKey.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AccountSshKeyAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ApprovalCategory.java (99%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ApprovalCategoryAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ApprovalCategoryValue.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ApprovalCategoryValueAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/AuthType.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/Branch.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/Change.java (99%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ChangeAccess.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ChangeMessage.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ChangeMessageAccess.java (96%) rename {src/main/java/com/google/gerrit/client/rpc => gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb}/CodedEnum.java (95%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ContactInformation.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ContributorAgreement.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ContributorAgreementAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/Patch.java (90%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/PatchLineComment.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/PatchLineCommentAccess.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/PatchSet.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/PatchSetAccess.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/PatchSetAncestor.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/PatchSetAncestorAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/PatchSetApproval.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/PatchSetApprovalAccess.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/PatchSetInfo.java (94%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/Project.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ProjectAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ProjectRight.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ProjectRightAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/RevId.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/ReviewDb.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/SchemaVersion.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/SchemaVersionAccess.java (95%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/StarredChange.java (97%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/StarredChangeAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/SystemConfig.java (98%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/SystemConfigAccess.java (96%) rename {src/main/java/com/google/gerrit/client => gerrit-reviewdb/src/main/java/com/google/gerrit}/reviewdb/UserIdentity.java (97%) create mode 100644 gerrit-server/.gitignore create mode 100644 gerrit-server/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-server/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-server/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-server/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-server/pom.xml rename {src => gerrit-server/src}/main/antlr/com/google/gerrit/server/query/Query.g (100%) create mode 100644 gerrit-server/src/main/java/com/google/gerrit/common/Version.java rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/AccessPath.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/AnonymousUser.java (92%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/ChangeUtil.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/CurrentUser.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/FileTypeRegistry.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/GerritPersonIdent.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/IdentifiedUser.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/ParamertizedString.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/RemotePeer.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/ReplicationUser.java (94%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/RequestCleanup.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/UrlEncoded.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AccountByEmailCache.java (94%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AccountCache.java (94%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AccountCacheImpl.java (94%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AccountException.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java (93%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AccountManager.java (97%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AccountResolver.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AccountState.java (93%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AuthRequest.java (94%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/AuthResult.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/DefaultRealm.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/EmailExpander.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/GroupCache.java (94%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/GroupCacheImpl.java (98%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/GroupControl.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/NoSuchGroupException.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/account/Realm.java (93%) rename {src/main/java/com/google/gerrit/server => gerrit-server/src/main/java/com/google/gerrit/server/auth}/ldap/LdapModule.java (91%) rename {src/main/java/com/google/gerrit/server => gerrit-server/src/main/java/com/google/gerrit/server/auth}/ldap/LdapQuery.java (98%) rename {src/main/java/com/google/gerrit/server => gerrit-server/src/main/java/com/google/gerrit/server/auth}/ldap/LdapRealm.java (98%) rename {src/main/java/com/google/gerrit/server => gerrit-server/src/main/java/com/google/gerrit/server/auth}/ldap/LdapType.java (98%) rename {src/main/java/com/google/gerrit/server => gerrit-server/src/main/java/com/google/gerrit/server/auth}/ldap/SearchScope.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/cache/Cache.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/cache/CacheModule.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/cache/CachePool.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/cache/CacheProvider.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/cache/EvictionPolicy.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/cache/NamedCacheBinding.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/cache/ProxyEhcache.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/cache/SelfPopulatingCache.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/cache/SimpleCache.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/cache/UnnamedCacheBinding.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/ApprovalTypesProvider.java (88%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/AuthConfig.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/CanonicalWebUrl.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/CanonicalWebUrlModule.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/ConfigUtil.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/DatabaseModule.java (93%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/FactoryModule.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/GerritConfigModule.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/GerritGlobalModule.java (89%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/GerritRequestModule.java (97%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/GerritServerConfig.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/Nullable.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java (97%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/ReviewDbDataSourceProvider.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/ReviewDbDatabaseProvider.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/SitePath.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/SitePathProvider.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/SystemConfigProvider.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/WildProjectName.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/config/WildProjectNameProvider.java (89%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/contact/ContactStore.java (81%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java (98%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java (97%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/contact/NoContactStore.java (84%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/ChangeMergeQueue.java (97%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/CodeReviewCommit.java (93%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/CommitMergeStatus.java (96%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/DefaultQueueOp.java (96%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/GitRepositoryManager.java (99%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/MergeException.java (96%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/MergeOp.java (98%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/MergeQueue.java (91%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/MergeSorter.java (98%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/PatchSetImporter.java (92%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/PushAllProjectsOp.java (93%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/PushOp.java (99%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/PushReplication.java (98%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/ReloadSubmitQueueOp.java (91%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/ReplicationQueue.java (96%) rename {src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/git/WorkQueue.java (99%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java (99%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/AbandonedSender.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/AddReviewerSender.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/Address.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/CommentSender.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/CreateChangeSender.java (90%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/EmailException.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/EmailHeader.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/EmailSender.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/FromAddressGenerator.java (93%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java (98%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/MergeFailSender.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/MergedSender.java (91%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/NewChangeSender.java (88%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/OutgoingEmail.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/RecipientType.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java (89%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java (99%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/patch/PatchFile.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/patch/PatchList.java (98%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/patch/PatchListCache.java (85%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/patch/PatchListEntry.java (97%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/patch/PatchListKey.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java (89%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/patch/PatchSetInfoNotAvailableException.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/patch/Text.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/project/ChangeControl.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/project/NoSuchChangeException.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/project/NoSuchProjectException.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/project/ProjectCache.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java (96%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/project/ProjectControl.java (91%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/project/ProjectState.java (93%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/query/AndPredicate.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java (98%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/query/NotPredicate.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/query/ObjectIdPredicate.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/query/OperatorPredicate.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/query/OrPredicate.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/query/Predicate.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/query/QueryBuilder.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/query/QueryParseException.java (100%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/ssh/SshInfo.java (77%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/ssh/SshKeyCache.java (71%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/workflow/CategoryFunction.java (93%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/workflow/FunctionState.java (93%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java (93%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/workflow/NoOpFunction.java (95%) rename {src => gerrit-server/src}/main/java/com/google/gerrit/server/workflow/SubmitFunction.java (90%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/server/ParamertizedStringTest.java (100%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/server/config/SystemConfigProviderTest.java (96%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java (100%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/server/mail/AddressTest.java (100%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java (98%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java (95%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/server/query/ChangeQueryBuilderTest.java (100%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/server/query/FieldPredicateTest.java (100%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/server/query/NotPredicateTest.java (100%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/server/query/QueryParserTest.java (100%) rename {src => gerrit-server/src}/test/java/com/google/gerrit/testutil/TestDatabase.java (98%) create mode 100644 gerrit-sshd/.gitignore create mode 100644 gerrit-sshd/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-sshd/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-sshd/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-sshd/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-sshd/pom.xml rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/AdminCommand.java (96%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/BaseCommand.java (98%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/CommandFactoryProvider.java (96%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/CommandModule.java (98%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/CommandName.java (96%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/Commands.java (99%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/DatabasePubKeyAuth.java (90%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/DispatchCommand.java (99%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/DispatchCommandProvider.java (98%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/HostKeyProvider.java (98%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/NoShell.java (85%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/SshCurrentUserProvider.java (90%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/SshDaemon.java (89%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/SshKeyCacheEntry.java (89%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/SshKeyCacheImpl.java (78%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/SshModule.java (85%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/SshScopes.java (98%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/SshUtil.java (96%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/args4j/AccountGroupIdHandler.java (94%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/args4j/AccountIdHandler.java (95%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/args4j/PatchSetIdHandler.java (94%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/args4j/ProjectControlHandler.java (96%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/AbstractGitCommand.java (90%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/AdminCreateProject.java (88%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/AdminFlushCaches.java (96%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/AdminReplicate.java (89%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/AdminShowCaches.java (98%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/AdminShowConnections.java (94%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/AdminShowQueue.java (93%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/ApproveCommand.java (93%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/ApproveOption.java (93%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/CacheCommand.java (94%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/DefaultCommandModule.java (89%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/ErrorSlaveMode.java (92%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/ListProjects.java (91%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/MasterCommandModule.java (84%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/Receive.java (96%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/ScpCommand.java (97%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/SlaveCommandModule.java (84%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/commands/Upload.java (95%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/scproot/TOC (100%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/scproot/bin/gerrit-cherry-pick (100%) rename {src/main/java/com/google/gerrit/server/ssh => gerrit-sshd/src/main/java/com/google/gerrit/sshd}/scproot/hooks/commit-msg (100%) rename {src/test/java/com/google/gerrit/server/ssh => gerrit-sshd/src/test/java/com/google/gerrit/sshd}/scproot/hooks/CommitMsgHookTest.java (99%) rename {src/test/java/com/google/gerrit/server/ssh => gerrit-sshd/src/test/java/com/google/gerrit/sshd}/scproot/hooks/HookTestCase.java (96%) rename {src => gerrit-sshd/src}/test/java/com/google/gerrit/testutil/LocalDiskRepositoryTestCase.java (100%) rename {src => gerrit-sshd/src}/test/java/com/google/gerrit/testutil/MockSystemReader.java (100%) create mode 100644 gerrit-util-cli/.gitignore create mode 100644 gerrit-util-cli/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-util-cli/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-util-cli/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-util-cli/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-util-cli/pom.xml rename {src/main/java/com/google/gerrit/pgm => gerrit-util-cli/src/main/java/com/google/gerrit/util/cli}/CmdLineParser.java (99%) rename {src/main/java/com/google/gerrit/pgm => gerrit-util-cli/src/main/java/com/google/gerrit/util/cli}/OptionHandlerFactory.java (96%) rename {src/main/java/com/google/gerrit/pgm => gerrit-util-cli/src/main/java/com/google/gerrit/util/cli}/OptionHandlerUtil.java (97%) create mode 100644 gerrit-util-ssl/.gitignore create mode 100644 gerrit-util-ssl/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-util-ssl/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-util-ssl/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-util-ssl/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-util-ssl/pom.xml rename {src/main/java/com/google/gerrit/server/ioutil => gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl}/BlindSSLSocketFactory.java (98%) create mode 100644 gerrit-war/.gitignore create mode 100644 gerrit-war/.settings/org.eclipse.core.resources.prefs create mode 100644 gerrit-war/.settings/org.eclipse.core.runtime.prefs create mode 100644 gerrit-war/.settings/org.eclipse.jdt.core.prefs create mode 100644 gerrit-war/.settings/org.eclipse.jdt.ui.prefs create mode 100644 gerrit-war/pom.xml rename src/main/java/com/google/gerrit/server/http/GerritServletConfig.java => gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java (93%) rename {src => gerrit-war/src}/main/java/log4j.properties (100%) rename {src/main/java => gerrit-war/src/main/webapp/WEB-INF/extra}/GerritServer.properties_example (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/extra/jetty6/gerrit-jetty.sh (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/extra/jetty6/gerrit.xml (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/extra/jetty7/gerrit-jetty.sh (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/extra/jetty7/gerrit.xml (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/extra/jetty7/jetty_sslproxy.xml (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/index_generic.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/index_postgres.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/mysql_nextval.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade003_004.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade004_005_part1.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade004_005_part2.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade005_006.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade006_007.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade007_008.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade008_009.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade009_010.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade010_011.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade011_012_part1.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade011_012_part2.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade012_013_mysql.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade012_013_postgres.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade013_014_mysql.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade013_014_postgres.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade014_015_part1_mysql.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade014_015_part1_postgres.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade014_015_part2.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade015_016_part1_mysql.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade015_016_part1_postgres.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade015_016_part2.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade016_017_mysql.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade016_017_postgres.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade017_018_mysql.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade017_018_postgres.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade018_019_mysql.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/sql/upgrade018_019_postgres.sql (100%) rename {src => gerrit-war/src}/main/webapp/WEB-INF/web.xml (85%) rename {src => gerrit-war/src}/main/webapp/favicon.ico (100%) rename {src => gerrit-war/src}/main/webapp/robots.txt (100%) delete mode 100644 gerrit_debug.launch delete mode 100644 gerrit_macos.launch delete mode 100644 src/main/java/com/google/gerrit/server/rpc/SystemInfoServiceImpl.java delete mode 100644 src/main/webapp/WEB-INF/web-jetty.xml delete mode 100755 to_hosted.sh rename GoogleFormat.xml => tools/GoogleFormat.xml (100%) create mode 100644 tools/gwtui_any.launch create mode 100644 tools/gwtui_mac.launch create mode 100644 tools/pgm_daemon.launch rename to_jetty.sh => tools/to_jetty.sh (83%) diff --git a/.gitignore b/.gitignore index b9a7f88e15..fdd9fa12a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,3 @@ -/target -/GerritServer.properties -/.classpath /.project /.settings/org.maven.ide.eclipse.prefs -/src/main/java/GerritServer.properties -/src/main/java/com/google/gerrit/client/GerritVersion.properties -/src/main/java/com/google/gerrit/client/GerritVersion_*.properties -/src/main/webapp/gerrit -/src/main/webapp/WEB-INF/lib -/hs_err_pid*.log +/GerritServer.properties diff --git a/Documentation/dev-eclipse.txt b/Documentation/dev-eclipse.txt index 416f2a3ea9..44e85b5f6c 100644 --- a/Documentation/dev-eclipse.txt +++ b/Documentation/dev-eclipse.txt @@ -40,8 +40,8 @@ http://m2eclipse.codehaus.org/[m2eclipse] Code Formatter Settings ----------------------- -Import GoogleFormat.xml using Window -> Preferences -> Java -> -Code Style -> Formatter -> Import... +Import `tools/GoogleFormat.xml` using Window -> Preferences -> +Java -> Code Style -> Formatter -> Import... This will define the 'Google Format' profile, which the project settings prefer when formatting source code. @@ -59,7 +59,7 @@ builds are used. [NOTE] Some of the source code is generated with ANTLR sources. To -build these files, you need to right click on the imported project, +build these files, you need to right click on the imported projects, Maven -> Update Project Configuration. This should fix the compile errors identified after import. @@ -74,19 +74,10 @@ Configure Database You may have already done this step earlier, based on the instructions in link:dev-readme.html[Developer Setup]. -* Open gerrit/src/main/java -* Copy `GerritServer.properties_example` to `GerritServer.properties` +* Navigate to gerrit-war/src/main/webapp/WEB-INF/extra/ +* Copy `GerritServer.properties_example` to `gerrit-parent/GerritServer.properties` * Configure your database for debugging in hosted mode. -Bootstrap Compile ------------------ - -From the command line we have to bootstrap the environment: - ----- - ./to_hosted.sh ----- - Production Compile ------------------ @@ -96,17 +87,15 @@ Production Compile mvn clean package ---- -to create a production build. The `./to_hosted.sh` used above -to setup the development environment for Eclipse hosted mode also -creates a state that produces a corrupt production build. +to create a production build. Launch Gerrit ------------- Open Run->Debug Configurations... -Under Java Application find `gerrit_debug` (not Mac OS X) -or `gerrit_macos` (Mac OS X only) to start the GWT hosted +Under Java Application find `gwtui_any` (not Mac OS X) +or `gwtui_mac` (Mac OS X only) to start the GWT hosted mode browser and debug through Eclipse. Final Setup diff --git a/Documentation/dev-readme.txt b/Documentation/dev-readme.txt index e0e2017dd0..6748322ee9 100644 --- a/Documentation/dev-readme.txt +++ b/Documentation/dev-readme.txt @@ -43,8 +43,7 @@ gwtorm supports (or add the necessary dialect support to gwtorm, and then configure your workspace anyway). ==== - cd src/main/java - cp GerritServer.properties_example GerritServer.properties + cp gerrit-war/src/main/webapp/WEB-INF/extra/GerritServer.properties_example GerritServer.properties ==== Now edit GerritServer.properties to uncomment the database you are @@ -104,7 +103,7 @@ From the command line: Output WAR will be placed in: ==== - target/gerrit-*.war + gerrit-war/target/gerrit-*.war ==== When debugging browser specific issues use gwtStyle `DETAILED` so diff --git a/Documentation/install.txt b/Documentation/install.txt index fbabba1d95..1e0bd8c825 100644 --- a/Documentation/install.txt +++ b/Documentation/install.txt @@ -47,7 +47,7 @@ Maven from a source download obtained directly from Git: git clone git://android.git.kernel.org/tools/gerrit.git cd gerrit mvn clean package - cp target/gerrit-*.war ...YOUR.DEST.../gerrit.war + cp gerrit-war/target/gerrit-*.war ...YOUR.DEST.../gerrit.war ==== The first build may take a while as dependencies are searched diff --git a/gerrit-common/.gitignore b/gerrit-common/.gitignore new file mode 100644 index 0000000000..f89cac402a --- /dev/null +++ b/gerrit-common/.gitignore @@ -0,0 +1,5 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs +/src/main/java/com/google/gerrit/common/Version.properties diff --git a/.settings/org.eclipse.core.resources.prefs b/gerrit-common/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from .settings/org.eclipse.core.resources.prefs rename to gerrit-common/.settings/org.eclipse.core.resources.prefs diff --git a/.settings/org.eclipse.core.runtime.prefs b/gerrit-common/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from .settings/org.eclipse.core.runtime.prefs rename to gerrit-common/.settings/org.eclipse.core.runtime.prefs diff --git a/.settings/org.eclipse.jdt.core.prefs b/gerrit-common/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from .settings/org.eclipse.jdt.core.prefs rename to gerrit-common/.settings/org.eclipse.jdt.core.prefs diff --git a/.settings/org.eclipse.jdt.ui.prefs b/gerrit-common/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from .settings/org.eclipse.jdt.ui.prefs rename to gerrit-common/.settings/org.eclipse.jdt.ui.prefs diff --git a/gerrit-common/pom.xml b/gerrit-common/pom.xml new file mode 100644 index 0000000000..df3c1a379f --- /dev/null +++ b/gerrit-common/pom.xml @@ -0,0 +1,85 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-common + Gerrit Code Review - Common + + + Classes common to both server and client. + + + + + com.google.gwt + gwt-servlet + provided + + + + gwtexpui + gwtexpui + + + + com.google.gerrit + gerrit-reviewdb + + + + com.google.gerrit + gerrit-patch-jgit + + + + + + + maven-antrun-plugin + + + generate-version + generate-resources + + + + + + + + + version=${v} + + + + run + + + + + + + diff --git a/gerrit-common/src/main/java/com/google/gerrit/Common.gwt.xml b/gerrit-common/src/main/java/com/google/gerrit/Common.gwt.xml new file mode 100644 index 0000000000..171ae8ab34 --- /dev/null +++ b/gerrit-common/src/main/java/com/google/gerrit/Common.gwt.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java new file mode 100644 index 0000000000..71b55c9217 --- /dev/null +++ b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java @@ -0,0 +1,68 @@ +// Copyright (C) 2008 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.common; + +import com.google.gerrit.common.data.AccountInfo; +import com.google.gerrit.common.data.ChangeInfo; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.Change; +import com.google.gwtorm.client.KeyUtil; + +public class PageLinks { + public static final String SETTINGS = "settings"; + public static final String SETTINGS_SSHKEYS = "settings,ssh-keys"; + public static final String SETTINGS_WEBIDENT = "settings,web-identities"; + public static final String SETTINGS_MYGROUPS = "settings,group-memberships"; + public static final String SETTINGS_AGREEMENTS = "settings,agreements"; + public static final String SETTINGS_CONTACT = "settings,contact"; + public static final String SETTINGS_PROJECTS = "settings,projects"; + public static final String SETTINGS_NEW_AGREEMENT = "settings,new-agreement"; + public static final String REGISTER = "register"; + + public static final String MINE = "mine"; + public static final String MINE_STARRED = "mine,starred"; + public static final String MINE_DRAFTS = "mine,drafts"; + + public static final String ALL_ABANDONED = "all,abandoned,n,z"; + public static final String ALL_MERGED = "all,merged,n,z"; + public static final String ALL_OPEN = "all,open,n,z"; + + public static final String ADMIN_PEOPLE = "admin,people"; + public static final String ADMIN_GROUPS = "admin,groups"; + public static final String ADMIN_PROJECTS = "admin,projects"; + + public static String toChange(final ChangeInfo c) { + return toChange(c.getId()); + } + + public static String toChange(final Change.Id c) { + return "change," + c.toString(); + } + + public static String toAccountDashboard(final AccountInfo acct) { + return toAccountDashboard(acct.getId()); + } + + public static String toAccountDashboard(final Account.Id acct) { + return "dashboard," + acct.toString(); + } + + public static String toChangeQuery(final String query) { + return "q," + KeyUtil.encode(query) + ",n,z"; + } + + protected PageLinks() { + } +} diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/auth/SignInMode.java b/gerrit-common/src/main/java/com/google/gerrit/common/auth/SignInMode.java new file mode 100644 index 0000000000..867ed56ca2 --- /dev/null +++ b/gerrit-common/src/main/java/com/google/gerrit/common/auth/SignInMode.java @@ -0,0 +1,19 @@ +// Copyright (C) 2008 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.common.auth; + +public enum SignInMode { + SIGN_IN, LINK_IDENTIY, REGISTER; +} diff --git a/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java b/gerrit-common/src/main/java/com/google/gerrit/common/auth/SignInRequired.java similarity index 86% rename from src/main/java/com/google/gerrit/client/rpc/SignInRequired.java rename to gerrit-common/src/main/java/com/google/gerrit/common/auth/SignInRequired.java index 7fdbb6f60d..cd9fa25e92 100644 --- a/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/auth/SignInRequired.java @@ -12,7 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.auth; + +import com.google.gerrit.common.errors.NotSignedInException; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -23,8 +25,7 @@ import java.lang.annotation.Target; * Annotation indicating a service method requires a current user. *

* If there is no current user then {@link NotSignedInException} will be given - * to the callback's onFailure method. Methods tagged with this will never get - * null from {@link Common#getAccountId()}. + * to the callback's onFailure method. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) diff --git a/src/main/java/com/google/gerrit/client/auth/openid/DiscoveryResult.java b/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/DiscoveryResult.java similarity index 95% rename from src/main/java/com/google/gerrit/client/auth/openid/DiscoveryResult.java rename to gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/DiscoveryResult.java index b2cfd58378..c5144fea4f 100644 --- a/src/main/java/com/google/gerrit/client/auth/openid/DiscoveryResult.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/DiscoveryResult.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.auth.openid; +package com.google.gerrit.common.auth.openid; import java.util.Map; diff --git a/src/main/java/com/google/gerrit/client/auth/openid/OpenIdService.java b/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdService.java similarity index 85% rename from src/main/java/com/google/gerrit/client/auth/openid/OpenIdService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdService.java index 062651639e..48be20a5b4 100644 --- a/src/main/java/com/google/gerrit/client/auth/openid/OpenIdService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdService.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.auth.openid; +package com.google.gerrit.common.auth.openid; -import com.google.gerrit.client.SignInDialog; +import com.google.gerrit.common.auth.SignInMode; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.AllowCrossSiteRequest; import com.google.gwtjsonrpc.client.RemoteJsonService; public interface OpenIdService extends RemoteJsonService { @AllowCrossSiteRequest - void discover(String openidIdentifier, SignInDialog.Mode mode, + void discover(String openidIdentifier, SignInMode mode, boolean remember, String returnToken, AsyncCallback callback); } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java b/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java new file mode 100644 index 0000000000..706f465a25 --- /dev/null +++ b/gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java @@ -0,0 +1,24 @@ +// Copyright (C) 2009 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.common.auth.openid; + +public class OpenIdUrls { + public static final String OPENID_IDENTIFIER = "openid_identifier"; + public static final String LASTID_COOKIE = "gerrit.last_openid"; + + public static final String URL_YAHOO = "https://me.yahoo.com"; + public static final String URL_GOOGLE = + "https://www.google.com/accounts/o8/id"; +} diff --git a/src/main/java/com/google/gerrit/client/auth/userpass/LoginResult.java b/gerrit-common/src/main/java/com/google/gerrit/common/auth/userpass/LoginResult.java similarity index 93% rename from src/main/java/com/google/gerrit/client/auth/userpass/LoginResult.java rename to gerrit-common/src/main/java/com/google/gerrit/common/auth/userpass/LoginResult.java index d960a3d1fe..dcabf81d70 100644 --- a/src/main/java/com/google/gerrit/client/auth/userpass/LoginResult.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/auth/userpass/LoginResult.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.auth.userpass; +package com.google.gerrit.common.auth.userpass; public class LoginResult { public boolean success; diff --git a/src/main/java/com/google/gerrit/client/auth/userpass/UserPassAuthService.java b/gerrit-common/src/main/java/com/google/gerrit/common/auth/userpass/UserPassAuthService.java similarity index 95% rename from src/main/java/com/google/gerrit/client/auth/userpass/UserPassAuthService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/auth/userpass/UserPassAuthService.java index 3ed6968a20..955c76ac8e 100644 --- a/src/main/java/com/google/gerrit/client/auth/userpass/UserPassAuthService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/auth/userpass/UserPassAuthService.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.auth.userpass; +package com.google.gerrit.common.auth.userpass; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.AllowCrossSiteRequest; diff --git a/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountDashboardInfo.java similarity index 87% rename from src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/AccountDashboardInfo.java index 23d1620e51..abcfe28bb1 100644 --- a/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountDashboardInfo.java @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.changes.AccountDashboardScreen; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; import java.util.List; -/** Summary information needed for {@link AccountDashboardScreen}. */ +/** Summary information needed to display an account dashboard. */ public class AccountDashboardInfo { protected AccountInfoCache accounts; protected Account.Id owner; diff --git a/src/main/java/com/google/gerrit/client/data/AccountInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java similarity index 95% rename from src/main/java/com/google/gerrit/client/data/AccountInfo.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java index aa6b8f9b79..39c5d9c3ed 100644 --- a/src/main/java/com/google/gerrit/client/data/AccountInfo.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfo.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; /** Summary information about an {@link Account}, for simple tabular displays. */ public class AccountInfo { diff --git a/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfoCache.java similarity index 96% rename from src/main/java/com/google/gerrit/client/data/AccountInfoCache.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfoCache.java index 678ed766ab..cf5f20b56e 100644 --- a/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountInfoCache.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountProjectWatchInfo.java similarity index 86% rename from src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/AccountProjectWatchInfo.java index 1657f75d8a..89a50f125e 100644 --- a/src/main/java/com/google/gerrit/client/account/AccountProjectWatchInfo.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountProjectWatchInfo.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.account; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.AccountProjectWatch; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.AccountProjectWatch; +import com.google.gerrit.reviewdb.Project; public final class AccountProjectWatchInfo { protected AccountProjectWatch watch; diff --git a/src/main/java/com/google/gerrit/client/account/AccountSecurity.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountSecurity.java similarity index 81% rename from src/main/java/com/google/gerrit/client/account/AccountSecurity.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/AccountSecurity.java index 83bcb840a6..804dab8c92 100644 --- a/src/main/java/com/google/gerrit/client/account/AccountSecurity.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountSecurity.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.account; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountSshKey; -import com.google.gerrit.client.reviewdb.ContactInformation; -import com.google.gerrit.client.reviewdb.ContributorAgreement; -import com.google.gerrit.client.rpc.SignInRequired; +import com.google.gerrit.common.auth.SignInRequired; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountSshKey; +import com.google.gerrit.reviewdb.ContactInformation; +import com.google.gerrit.reviewdb.ContributorAgreement; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.RemoteJsonService; import com.google.gwtjsonrpc.client.VoidResult; diff --git a/src/main/java/com/google/gerrit/client/account/AccountService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java similarity index 85% rename from src/main/java/com/google/gerrit/client/account/AccountService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java index a707b41030..eaf84fa4a1 100644 --- a/src/main/java/com/google/gerrit/client/account/AccountService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AccountService.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.account; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGeneralPreferences; -import com.google.gerrit.client.reviewdb.AccountProjectWatch; -import com.google.gerrit.client.rpc.SignInRequired; +import com.google.gerrit.common.auth.SignInRequired; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGeneralPreferences; +import com.google.gerrit.reviewdb.AccountProjectWatch; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.RemoteJsonService; import com.google.gwtjsonrpc.client.VoidResult; diff --git a/src/main/java/com/google/gerrit/client/patches/AddReviewerResult.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AddReviewerResult.java similarity index 95% rename from src/main/java/com/google/gerrit/client/patches/AddReviewerResult.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/AddReviewerResult.java index d6f0dfe796..e8764a7ef2 100644 --- a/src/main/java/com/google/gerrit/client/patches/AddReviewerResult.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AddReviewerResult.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.patches; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.ChangeDetail; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/google/gerrit/client/account/AgreementInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/AgreementInfo.java similarity index 71% rename from src/main/java/com/google/gerrit/client/account/AgreementInfo.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/AgreementInfo.java index fc1f53e7a3..7ae651ee62 100644 --- a/src/main/java/com/google/gerrit/client/account/AgreementInfo.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/AgreementInfo.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.account; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.AccountAgreement; -import com.google.gerrit.client.reviewdb.AccountGroupAgreement; -import com.google.gerrit.client.reviewdb.ContributorAgreement; +import com.google.gerrit.reviewdb.AccountAgreement; +import com.google.gerrit.reviewdb.AccountGroupAgreement; +import com.google.gerrit.reviewdb.ContributorAgreement; import java.util.List; import java.util.Map; public class AgreementInfo { - protected List userAccepted; - protected List groupAccepted; - protected Map agreements; + public List userAccepted; + public List groupAccepted; + public Map agreements; public AgreementInfo() { } diff --git a/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalDetail.java similarity index 91% rename from src/main/java/com/google/gerrit/client/data/ApprovalDetail.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalDetail.java index 1a482b2812..33f4da741f 100644 --- a/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalDetail.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.PatchSetApproval; import java.sql.Timestamp; import java.util.ArrayList; diff --git a/src/main/java/com/google/gerrit/client/data/ApprovalSummary.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalSummary.java similarity index 89% rename from src/main/java/com/google/gerrit/client/data/ApprovalSummary.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalSummary.java index 39df89ff9f..57e8b71d10 100644 --- a/src/main/java/com/google/gerrit/client/data/ApprovalSummary.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalSummary.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.PatchSetApproval; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/com/google/gerrit/client/data/ApprovalSummarySet.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalSummarySet.java similarity index 94% rename from src/main/java/com/google/gerrit/client/data/ApprovalSummarySet.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalSummarySet.java index 4478476c59..57ee92873f 100644 --- a/src/main/java/com/google/gerrit/client/data/ApprovalSummarySet.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalSummarySet.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Change; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/com/google/gerrit/client/data/ApprovalType.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalType.java similarity index 93% rename from src/main/java/com/google/gerrit/client/data/ApprovalType.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalType.java index 2437969c44..ea9aedb750 100644 --- a/src/main/java/com/google/gerrit/client/data/ApprovalType.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalType.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.PatchSetApproval; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/google/gerrit/client/data/ApprovalTypes.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalTypes.java similarity index 95% rename from src/main/java/com/google/gerrit/client/data/ApprovalTypes.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalTypes.java index 9d91ef870a..01dca1c966 100644 --- a/src/main/java/com/google/gerrit/client/data/ApprovalTypes.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalTypes.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategory; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/google/gerrit/client/data/ChangeDetail.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeDetail.java similarity index 92% rename from src/main/java/com/google/gerrit/client/data/ChangeDetail.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeDetail.java index 8aa32988bc..80c1c31f28 100644 --- a/src/main/java/com/google/gerrit/client/data/ChangeDetail.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeDetail.java @@ -12,13 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.changes.ChangeScreen; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeMessage; -import com.google.gerrit.client.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.PatchSet; import java.util.ArrayList; import java.util.Collection; @@ -26,7 +25,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -/** Detail necessary to display {@link ChangeScreen}. */ +/** Detail necessary to display a change. */ public class ChangeDetail { protected AccountInfoCache accounts; protected boolean allowsAnonymous; diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeDetailService.java similarity index 78% rename from src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeDetailService.java index af2d63dfe5..e79895ae6d 100644 --- a/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeDetailService.java @@ -12,13 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.changes; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.data.PatchSetDetail; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.rpc.SignInRequired; +import com.google.gerrit.common.auth.SignInRequired; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.RemoteJsonService; diff --git a/src/main/java/com/google/gerrit/client/data/ChangeInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeInfo.java similarity index 93% rename from src/main/java/com/google/gerrit/client/data/ChangeInfo.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeInfo.java index 4aa9879a32..3de4ee090f 100644 --- a/src/main/java/com/google/gerrit/client/data/ChangeInfo.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeInfo.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.Change; import java.sql.Timestamp; diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeListService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeListService.java similarity index 89% rename from src/main/java/com/google/gerrit/client/changes/ChangeListService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeListService.java index e5f2668e5e..c9668ca7e0 100644 --- a/src/main/java/com/google/gerrit/client/changes/ChangeListService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeListService.java @@ -12,14 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.changes; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.AccountDashboardInfo; -import com.google.gerrit.client.data.SingleListChangeInfo; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.rpc.SignInRequired; +import com.google.gerrit.common.auth.SignInRequired; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Project; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.RemoteJsonService; import com.google.gwtjsonrpc.client.VoidResult; @@ -73,7 +71,7 @@ public interface ChangeListService extends RemoteJsonService { void allQueryNext(String query, String pos, int limit, AsyncCallback callback); - /** Get the data to show {@link AccountDashboardScreen} for an account. */ + /** Get the data to show AccountDashboardScreen for an account. */ void forAccount(Account.Id id, AsyncCallback callback); /** Get the changes starred by the caller. */ diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeManageService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeManageService.java similarity index 83% rename from src/main/java/com/google/gerrit/client/changes/ChangeManageService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeManageService.java index 51ff541ba9..dc94557468 100644 --- a/src/main/java/com/google/gerrit/client/changes/ChangeManageService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeManageService.java @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.changes; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.rpc.SignInRequired; +import com.google.gerrit.common.auth.SignInRequired; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.RemoteJsonService; diff --git a/src/main/java/com/google/gerrit/client/patches/CommentDetail.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/CommentDetail.java similarity index 95% rename from src/main/java/com/google/gerrit/client/patches/CommentDetail.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/CommentDetail.java index 7e417609cc..e35fb78c5f 100644 --- a/src/main/java/com/google/gerrit/client/patches/CommentDetail.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/CommentDetail.java @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.patches; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/google/gerrit/client/data/EditList.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/EditList.java similarity index 99% rename from src/main/java/com/google/gerrit/client/data/EditList.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/EditList.java index 019eaf0b06..5dd55eb019 100644 --- a/src/main/java/com/google/gerrit/client/data/EditList.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/EditList.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; import org.eclipse.jgit.diff.Edit; diff --git a/src/main/java/com/google/gerrit/client/data/GerritConfig.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java similarity index 94% rename from src/main/java/com/google/gerrit/client/data/GerritConfig.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java index 5344a2558d..b664b6506f 100644 --- a/src/main/java/com/google/gerrit/client/data/GerritConfig.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AuthType; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AuthType; +import com.google.gerrit.reviewdb.Project; import com.google.gwtexpui.safehtml.client.RegexFindReplace; import java.util.List; diff --git a/src/main/java/com/google/gerrit/client/data/GitwebLink.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GitwebLink.java similarity index 92% rename from src/main/java/com/google/gerrit/client/data/GitwebLink.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/GitwebLink.java index e293e86758..31963c1664 100644 --- a/src/main/java/com/google/gerrit/client/data/GitwebLink.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GitwebLink.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Project; import com.google.gwt.http.client.URL; /** Link to an external gitweb server. */ diff --git a/src/main/java/com/google/gerrit/client/admin/GroupAdminService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupAdminService.java similarity index 91% rename from src/main/java/com/google/gerrit/client/admin/GroupAdminService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/GroupAdminService.java index 4df860c3d8..0cb2a8b0d6 100644 --- a/src/main/java/com/google/gerrit/client/admin/GroupAdminService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupAdminService.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.admin; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountGroupMember; -import com.google.gerrit.client.rpc.SignInRequired; +import com.google.gerrit.common.auth.SignInRequired; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroupMember; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.RemoteJsonService; import com.google.gwtjsonrpc.client.VoidResult; diff --git a/src/main/java/com/google/gerrit/client/admin/GroupDetail.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDetail.java similarity index 72% rename from src/main/java/com/google/gerrit/client/admin/GroupDetail.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDetail.java index c73a72a899..c31db51aae 100644 --- a/src/main/java/com/google/gerrit/client/admin/GroupDetail.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDetail.java @@ -12,19 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.admin; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountGroupMember; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroupMember; import java.util.List; public class GroupDetail { - protected AccountInfoCache accounts; - protected AccountGroup group; - protected List members; - protected AccountGroup ownerGroup; + public AccountInfoCache accounts; + public AccountGroup group; + public List members; + public AccountGroup ownerGroup; public GroupDetail() { } diff --git a/src/main/java/com/google/gerrit/client/HostPageData.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/HostPageData.java similarity index 85% rename from src/main/java/com/google/gerrit/client/HostPageData.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/HostPageData.java index 14c6e7623f..31c9d52002 100644 --- a/src/main/java/com/google/gerrit/client/HostPageData.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/HostPageData.java @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.GerritConfig; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; /** Data sent as part of the host page, to bootstrap the UI. */ public class HostPageData { diff --git a/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/PatchDetailService.java similarity index 76% rename from src/main/java/com/google/gerrit/client/patches/PatchDetailService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/PatchDetailService.java index 446262aec0..6cb51c7f11 100644 --- a/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/PatchDetailService.java @@ -12,19 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.patches; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.ApprovalSummarySet; -import com.google.gerrit.client.data.PatchScript; -import com.google.gerrit.client.data.PatchScriptSettings; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.Patch.Key; -import com.google.gerrit.client.rpc.SignInRequired; +import com.google.gerrit.common.auth.SignInRequired; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Patch.Key; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.RemoteJsonService; import com.google.gwtjsonrpc.client.VoidResult; diff --git a/src/main/java/com/google/gerrit/client/data/PatchScript.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/PatchScript.java similarity index 93% rename from src/main/java/com/google/gerrit/client/data/PatchScript.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/PatchScript.java index 446d9666f4..89444b3f8d 100644 --- a/src/main/java/com/google/gerrit/client/data/PatchScript.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/PatchScript.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.PatchScriptSettings.Whitespace; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.common.data.PatchScriptSettings.Whitespace; +import com.google.gerrit.reviewdb.Change; import org.eclipse.jgit.diff.Edit; diff --git a/src/main/java/com/google/gerrit/client/data/PatchScriptSettings.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/PatchScriptSettings.java similarity index 91% rename from src/main/java/com/google/gerrit/client/data/PatchScriptSettings.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/PatchScriptSettings.java index 37862d5018..019ecdf490 100644 --- a/src/main/java/com/google/gerrit/client/data/PatchScriptSettings.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/PatchScriptSettings.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.AccountGeneralPreferences; -import com.google.gerrit.client.rpc.CodedEnum; +import com.google.gerrit.reviewdb.AccountGeneralPreferences; +import com.google.gerrit.reviewdb.CodedEnum; public class PatchScriptSettings { public static enum Whitespace implements CodedEnum { diff --git a/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/PatchSetDetail.java similarity index 85% rename from src/main/java/com/google/gerrit/client/data/PatchSetDetail.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/PatchSetDetail.java index 69a617ac1a..64e666efa5 100644 --- a/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/PatchSetDetail.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetInfo; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetInfo; import java.util.List; diff --git a/src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/PatchSetPublishDetail.java similarity index 84% rename from src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/PatchSetPublishDetail.java index 8e66eb69ad..70cc10dda6 100644 --- a/src/main/java/com/google/gerrit/client/changes/PatchSetPublishDetail.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/PatchSetPublishDetail.java @@ -12,15 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.changes; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSetInfo; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.PatchSetInfo; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectAdminService.java similarity index 86% rename from src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectAdminService.java index 969c7d99be..5f27e40598 100644 --- a/src/main/java/com/google/gerrit/client/admin/ProjectAdminService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectAdminService.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.admin; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; -import com.google.gerrit.client.rpc.SignInRequired; +import com.google.gerrit.common.auth.SignInRequired; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.RemoteJsonService; import com.google.gwtjsonrpc.client.VoidResult; diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectDetail.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectDetail.java similarity index 74% rename from src/main/java/com/google/gerrit/client/admin/ProjectDetail.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectDetail.java index 037e270a96..9c4619a8b4 100644 --- a/src/main/java/com/google/gerrit/client/admin/ProjectDetail.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectDetail.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.admin; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; import java.util.List; import java.util.Map; public class ProjectDetail { - protected Project project; - protected Map groups; - protected List rights; + public Project project; + public Map groups; + public List rights; public ProjectDetail() { } diff --git a/src/main/java/com/google/gerrit/client/data/ProjectInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectInfo.java similarity index 90% rename from src/main/java/com/google/gerrit/client/data/ProjectInfo.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectInfo.java index e56efd37ac..8f2293630e 100644 --- a/src/main/java/com/google/gerrit/client/data/ProjectInfo.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ProjectInfo.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Project; public class ProjectInfo { protected Project.NameKey key; diff --git a/src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/SingleListChangeInfo.java similarity index 97% rename from src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/SingleListChangeInfo.java index 26543e362c..e55375bdbe 100644 --- a/src/main/java/com/google/gerrit/client/data/SingleListChangeInfo.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/SingleListChangeInfo.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; import java.util.List; diff --git a/src/main/java/com/google/gerrit/client/data/SparseFileContent.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/SparseFileContent.java similarity index 98% rename from src/main/java/com/google/gerrit/client/data/SparseFileContent.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/SparseFileContent.java index 358692dc2c..99913c61f8 100644 --- a/src/main/java/com/google/gerrit/client/data/SparseFileContent.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/SparseFileContent.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/google/gerrit/client/data/SshHostKey.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java similarity index 97% rename from src/main/java/com/google/gerrit/client/data/SshHostKey.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java index 5ea37c9e30..1d4e3c9568 100644 --- a/src/main/java/com/google/gerrit/client/data/SshHostKey.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/SshHostKey.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; /** Description of the SSH daemon host key used by Gerrit. */ public class SshHostKey { diff --git a/src/main/java/com/google/gerrit/client/ui/SuggestService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/SuggestService.java similarity index 85% rename from src/main/java/com/google/gerrit/client/ui/SuggestService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/SuggestService.java index dd841652c7..b31ace2f9b 100644 --- a/src/main/java/com/google/gerrit/client/ui/SuggestService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/SuggestService.java @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.ui; +package com.google.gerrit.common.data; -import com.google.gerrit.client.data.AccountInfo; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Project; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.RemoteJsonService; diff --git a/src/main/java/com/google/gerrit/client/data/SystemInfoService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/SystemInfoService.java similarity index 87% rename from src/main/java/com/google/gerrit/client/data/SystemInfoService.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/SystemInfoService.java index d05dab13ef..d2322a1803 100644 --- a/src/main/java/com/google/gerrit/client/data/SystemInfoService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/SystemInfoService.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.data; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.ContributorAgreement; -import com.google.gerrit.client.rpc.SignInRequired; +import com.google.gerrit.common.auth.SignInRequired; +import com.google.gerrit.reviewdb.ContributorAgreement; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.AllowCrossSiteRequest; import com.google.gwtjsonrpc.client.RemoteJsonService; diff --git a/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/ToggleStarRequest.java similarity index 95% rename from src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/ToggleStarRequest.java index b8ce1fe4af..32178fbbb0 100644 --- a/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/ToggleStarRequest.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.changes; +package com.google.gerrit.common.data; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Change; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/google/gerrit/client/rpc/ContactInformationStoreException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/ContactInformationStoreException.java similarity index 96% rename from src/main/java/com/google/gerrit/client/rpc/ContactInformationStoreException.java rename to gerrit-common/src/main/java/com/google/gerrit/common/errors/ContactInformationStoreException.java index 1b1b7c1809..956d010a63 100644 --- a/src/main/java/com/google/gerrit/client/rpc/ContactInformationStoreException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/ContactInformationStoreException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.errors; /** Error indicating the server cannot store contact information. */ public class ContactInformationStoreException extends Exception { diff --git a/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/CorruptEntityException.java similarity index 96% rename from src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java rename to gerrit-common/src/main/java/com/google/gerrit/common/errors/CorruptEntityException.java index ea66687256..f2b3e98908 100644 --- a/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/CorruptEntityException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.errors; import com.google.gwtorm.client.Key; diff --git a/src/main/java/com/google/gerrit/client/rpc/InvalidNameException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidNameException.java similarity index 95% rename from src/main/java/com/google/gerrit/client/rpc/InvalidNameException.java rename to gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidNameException.java index 9060ff9833..5eb6e3f0b7 100644 --- a/src/main/java/com/google/gerrit/client/rpc/InvalidNameException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidNameException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.errors; /** Error indicating the entity name is invalid as supplied. */ public class InvalidNameException extends Exception { diff --git a/src/main/java/com/google/gerrit/client/rpc/InvalidRevisionException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidRevisionException.java similarity index 95% rename from src/main/java/com/google/gerrit/client/rpc/InvalidRevisionException.java rename to gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidRevisionException.java index c789a343e6..b4b54c16bb 100644 --- a/src/main/java/com/google/gerrit/client/rpc/InvalidRevisionException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidRevisionException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.errors; /** Error indicating the revision is invalid as supplied. */ public class InvalidRevisionException extends Exception { diff --git a/src/main/java/com/google/gerrit/client/rpc/InvalidSshKeyException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidSshKeyException.java similarity index 95% rename from src/main/java/com/google/gerrit/client/rpc/InvalidSshKeyException.java rename to gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidSshKeyException.java index 6bbcc7c04f..3398417a98 100644 --- a/src/main/java/com/google/gerrit/client/rpc/InvalidSshKeyException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidSshKeyException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.errors; /** Error indicating the SSH key string is invalid as supplied. */ public class InvalidSshKeyException extends Exception { diff --git a/src/main/java/com/google/gerrit/client/rpc/InvalidSshUserNameException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidSshUserNameException.java similarity index 91% rename from src/main/java/com/google/gerrit/client/rpc/InvalidSshUserNameException.java rename to gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidSshUserNameException.java index 3ed8665b45..4608d51dd6 100644 --- a/src/main/java/com/google/gerrit/client/rpc/InvalidSshUserNameException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidSshUserNameException.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.errors; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; /** Error indicating the SSH user name does not match {@link Account#SSH_USER_NAME_PATTERN} pattern. */ public class InvalidSshUserNameException extends Exception { diff --git a/src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NameAlreadyUsedException.java similarity index 95% rename from src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java rename to gerrit-common/src/main/java/com/google/gerrit/common/errors/NameAlreadyUsedException.java index 75ef431537..a2d487bdfc 100644 --- a/src/main/java/com/google/gerrit/client/rpc/NameAlreadyUsedException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NameAlreadyUsedException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.errors; /** Error indicating entity name is already taken by another entity. */ public class NameAlreadyUsedException extends Exception { diff --git a/src/main/java/com/google/gerrit/client/rpc/NoSuchAccountException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchAccountException.java similarity index 95% rename from src/main/java/com/google/gerrit/client/rpc/NoSuchAccountException.java rename to gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchAccountException.java index bc3255ed5a..90bf624928 100644 --- a/src/main/java/com/google/gerrit/client/rpc/NoSuchAccountException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchAccountException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.errors; /** Error indicating the account requested doesn't exist. */ public class NoSuchAccountException extends Exception { diff --git a/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchEntityException.java similarity index 95% rename from src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java rename to gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchEntityException.java index bcd271d30e..c47cf07cc0 100644 --- a/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchEntityException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.errors; /** Error indicating the entity requested doesn't exist. */ public class NoSuchEntityException extends Exception { diff --git a/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NotSignedInException.java similarity index 95% rename from src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java rename to gerrit-common/src/main/java/com/google/gerrit/common/errors/NotSignedInException.java index 2cadef566b..65caf020dc 100644 --- a/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NotSignedInException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.common.errors; /** Error stating the user must be signed-in in order to perform this action. */ public class NotSignedInException extends Exception { diff --git a/gerrit-gwtdebug/.gitignore b/gerrit-gwtdebug/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-gwtdebug/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-gwtdebug/.settings/org.eclipse.core.resources.prefs b/gerrit-gwtdebug/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-gwtdebug/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-gwtdebug/.settings/org.eclipse.core.runtime.prefs b/gerrit-gwtdebug/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-gwtdebug/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-gwtdebug/.settings/org.eclipse.jdt.core.prefs b/gerrit-gwtdebug/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-gwtdebug/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-gwtdebug/.settings/org.eclipse.jdt.ui.prefs b/gerrit-gwtdebug/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-gwtdebug/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-gwtdebug/pom.xml b/gerrit-gwtdebug/pom.xml new file mode 100644 index 0000000000..7173e98e90 --- /dev/null +++ b/gerrit-gwtdebug/pom.xml @@ -0,0 +1,66 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-gwtdbug + Gerrit Code Review - GWT UI Debugging Support + + + Debugging support for the GWT UI + + + + + com.google.gwt + gwt-dev + ${platform} + + + + com.google.gerrit + gerrit-gwtui + + + + com.google.gerrit + gerrit-war + + + + bouncycastle + bcprov-jdk15 + 140 + provided + + + + bouncycastle + bcpg-jdk15 + 140 + provided + + + diff --git a/gerrit-gwtdebug/src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java b/gerrit-gwtdebug/src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java new file mode 100644 index 0000000000..d5f913a6ab --- /dev/null +++ b/gerrit-gwtdebug/src/main/java/com/google/gerrit/gwtdebug/GerritDebugLauncher.java @@ -0,0 +1,419 @@ +/* + * Copyright 2008 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.gerrit.gwtdebug; + +import com.google.gwt.core.ext.ServletContainer; +import com.google.gwt.core.ext.ServletContainerLauncher; +import com.google.gwt.core.ext.TreeLogger; +import com.google.gwt.core.ext.UnableToCompleteException; +import com.google.gwt.dev.shell.jetty.JettyNullLogger; + +import org.mortbay.component.AbstractLifeCycle; +import org.mortbay.jetty.AbstractConnector; +import org.mortbay.jetty.Request; +import org.mortbay.jetty.RequestLog; +import org.mortbay.jetty.Response; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.HttpFields.Field; +import org.mortbay.jetty.handler.RequestLogHandler; +import org.mortbay.jetty.nio.SelectChannelConnector; +import org.mortbay.jetty.webapp.WebAppClassLoader; +import org.mortbay.jetty.webapp.WebAppContext; +import org.mortbay.log.Log; +import org.mortbay.log.Logger; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Iterator; + +public class GerritDebugLauncher extends ServletContainerLauncher { + /** + * Log jetty requests/responses to TreeLogger. + */ + public static class JettyRequestLogger extends AbstractLifeCycle implements + RequestLog { + + private final TreeLogger logger; + + public JettyRequestLogger(TreeLogger logger) { + this.logger = logger; + } + + /** + * Log an HTTP request/response to TreeLogger. + */ + @SuppressWarnings("unchecked") + public void log(Request request, Response response) { + int status = response.getStatus(); + if (status < 0) { + // Copied from NCSARequestLog + status = 404; + } + TreeLogger.Type logStatus, logHeaders; + if (status >= 500) { + logStatus = TreeLogger.ERROR; + logHeaders = TreeLogger.INFO; + } else if (status >= 400) { + logStatus = TreeLogger.WARN; + logHeaders = TreeLogger.INFO; + } else { + logStatus = TreeLogger.INFO; + logHeaders = TreeLogger.DEBUG; + } + String userString = request.getRemoteUser(); + if (userString == null) { + userString = ""; + } else { + userString += "@"; + } + String bytesString = ""; + if (response.getContentCount() > 0) { + bytesString = " " + response.getContentCount() + " bytes"; + } + if (logger.isLoggable(logStatus)) { + TreeLogger branch = + logger.branch(logStatus, String.valueOf(status) + " - " + + request.getMethod() + ' ' + request.getUri() + " (" + + userString + request.getRemoteHost() + ')' + bytesString); + if (branch.isLoggable(logHeaders)) { + // Request headers + TreeLogger headers = branch.branch(logHeaders, "Request headers"); + Iterator headerFields = + request.getConnection().getRequestFields().getFields(); + while (headerFields.hasNext()) { + Field headerField = headerFields.next(); + headers.log(logHeaders, headerField.getName() + ": " + + headerField.getValue()); + } + // Response headers + headers = branch.branch(logHeaders, "Response headers"); + headerFields = response.getHttpFields().getFields(); + while (headerFields.hasNext()) { + Field headerField = headerFields.next(); + headers.log(logHeaders, headerField.getName() + ": " + + headerField.getValue()); + } + } + } + } + } + + /** + * An adapter for the Jetty logging system to GWT's TreeLogger. This + * implementation class is only public to allow {@link Log} to instantiate it. + * + * The weird static data / default construction setup is a game we play with + * {@link Log}'s static initializer to prevent the initial log message from + * going to stderr. + */ + public static class JettyTreeLogger implements Logger { + private final TreeLogger logger; + + public JettyTreeLogger(TreeLogger logger) { + if (logger == null) { + throw new NullPointerException(); + } + this.logger = logger; + } + + public void debug(String msg, Object arg0, Object arg1) { + logger.log(TreeLogger.SPAM, format(msg, arg0, arg1)); + } + + public void debug(String msg, Throwable th) { + logger.log(TreeLogger.SPAM, msg, th); + } + + public Logger getLogger(String name) { + return this; + } + + public void info(String msg, Object arg0, Object arg1) { + logger.log(TreeLogger.INFO, format(msg, arg0, arg1)); + } + + public boolean isDebugEnabled() { + return logger.isLoggable(TreeLogger.SPAM); + } + + public void setDebugEnabled(boolean enabled) { + // ignored + } + + public void warn(String msg, Object arg0, Object arg1) { + logger.log(TreeLogger.WARN, format(msg, arg0, arg1)); + } + + public void warn(String msg, Throwable th) { + logger.log(TreeLogger.WARN, msg, th); + } + + /** + * Copied from org.mortbay.log.StdErrLog. + */ + private String format(String msg, Object arg0, Object arg1) { + int i0 = msg.indexOf("{}"); + int i1 = i0 < 0 ? -1 : msg.indexOf("{}", i0 + 2); + + if (arg1 != null && i1 >= 0) { + msg = msg.substring(0, i1) + arg1 + msg.substring(i1 + 2); + } + if (arg0 != null && i0 >= 0) { + msg = msg.substring(0, i0) + arg0 + msg.substring(i0 + 2); + } + return msg; + } + } + + /** + * The resulting {@link ServletContainer} this is launched. + */ + protected static class JettyServletContainer extends ServletContainer { + private final int actualPort; + private final File appRootDir; + private final TreeLogger logger; + private final Server server; + private final WebAppContext wac; + + public JettyServletContainer(TreeLogger logger, Server server, + WebAppContext wac, int actualPort, File appRootDir) { + this.logger = logger; + this.server = server; + this.wac = wac; + this.actualPort = actualPort; + this.appRootDir = appRootDir; + } + + @Override + public int getPort() { + return actualPort; + } + + @Override + public void refresh() throws UnableToCompleteException { + String msg = + "Reloading web app to reflect changes in " + + appRootDir.getAbsolutePath(); + TreeLogger branch = logger.branch(TreeLogger.INFO, msg); + // Temporarily log Jetty on the branch. + Log.setLog(new JettyTreeLogger(branch)); + try { + wac.stop(); + wac.start(); + branch.log(TreeLogger.INFO, "Reload completed successfully"); + } catch (Exception e) { + branch.log(TreeLogger.ERROR, "Unable to restart embedded Jetty server", + e); + throw new UnableToCompleteException(); + } finally { + // Reset the top-level logger. + Log.setLog(new JettyTreeLogger(logger)); + } + } + + @Override + public void stop() throws UnableToCompleteException { + TreeLogger branch = + logger.branch(TreeLogger.INFO, "Stopping Jetty server"); + // Temporarily log Jetty on the branch. + Log.setLog(new JettyTreeLogger(branch)); + try { + server.stop(); + server.setStopAtShutdown(false); + branch.log(TreeLogger.INFO, "Stopped successfully"); + } catch (Exception e) { + branch.log(TreeLogger.ERROR, "Unable to stop embedded Jetty server", e); + throw new UnableToCompleteException(); + } finally { + // Reset the top-level logger. + Log.setLog(new JettyTreeLogger(logger)); + } + } + } + + /** + * A {@link WebAppContext} tailored to GWT hosted mode. Features hot-reload + * with a new {@link WebAppClassLoader} to pick up disk changes. The default + * Jetty {@code WebAppContext} will create new instances of servlets, but it + * will not create a brand new {@link ClassLoader}. By creating a new {@code + * ClassLoader} each time, we re-read updated classes from disk. + * + * Also provides special class filtering to isolate the web app from the GWT + * hosting environment. + */ + protected final class MyWebAppContext extends WebAppContext { + /** + * Parent ClassLoader for the Jetty web app, which can only load JVM + * classes. We would just use null for the parent ClassLoader + * except this makes Jetty unhappy. + */ + private final ClassLoader bootStrapOnlyClassLoader = + new ClassLoader(null) {}; + + private final ClassLoader systemClassLoader = + Thread.currentThread().getContextClassLoader(); + + private final TreeLogger logger; + + @SuppressWarnings("unchecked") + private MyWebAppContext(TreeLogger logger, String webApp, String contextPath) { + super(webApp, contextPath); + this.logger = logger; + + // Prevent file locking on Windows; pick up file changes. + getInitParams().put( + "org.mortbay.jetty.servlet.Default.useFileMappedBuffer", "false"); + + // Since the parent class loader is bootstrap-only, prefer it first. + setParentLoaderPriority(true); + } + + @Override + protected void doStart() throws Exception { + setClassLoader(new MyLoader()); + super.doStart(); + } + + @Override + protected void doStop() throws Exception { + super.doStop(); + setClassLoader(null); + } + + private class MyLoader extends WebAppClassLoader { + MyLoader() throws IOException { + super(bootStrapOnlyClassLoader, MyWebAppContext.this); + + final URLClassLoader scl = (URLClassLoader) systemClassLoader; + final URL[] urls = scl.getURLs(); + for (URL u : urls) { + if ("file".equals(u.getProtocol())) { + addClassPath(u.getPath()); + } + } + } + + @Override + public boolean isSystemPath(String name) { + name = name.replace('/', '.'); + return super.isSystemPath(name) // + || name.startsWith("org.bouncycastle."); + } + + @Override + protected Class findClass(String name) throws ClassNotFoundException { + // For system path, always prefer the outside world. + if (isSystemPath(name)) { + try { + return systemClassLoader.loadClass(name); + } catch (ClassNotFoundException e) { + } + } + return super.findClass(name); + } + } + } + + static { + // Suppress spammy Jetty log initialization. + System + .setProperty("org.mortbay.log.class", JettyNullLogger.class.getName()); + Log.getLog(); + + /* + * Make JDT the default Ant compiler so that JSP compilation just works + * out-of-the-box. If we don't set this, it's very, very difficult to make + * JSP compilation work. + */ + String antJavaC = + System.getProperty("build.compiler", + "org.eclipse.jdt.core.JDTCompilerAdapter"); + System.setProperty("build.compiler", antJavaC); + } + + @Override + public ServletContainer start(TreeLogger logger, int port, File warDir) + throws Exception { + TreeLogger branch = + logger.branch(TreeLogger.INFO, "Starting Jetty on port " + port, null); + + checkStartParams(branch, port, warDir); + + // Setup our branch logger during startup. + Log.setLog(new JettyTreeLogger(branch)); + + // Turn off XML validation. + System.setProperty("org.mortbay.xml.XmlParser.Validating", "false"); + + AbstractConnector connector = getConnector(); + connector.setPort(port); + + // Don't share ports with an existing process. + connector.setReuseAddress(false); + + // Linux keeps the port blocked after shutdown if we don't disable this. + connector.setSoLingerTime(0); + + Server server = new Server(); + server.addConnector(connector); + + // warDir is "$top/gerrit-gwtui/target/gwt-hosted-mode" + // + File top = warDir.getParentFile().getParentFile().getParentFile(); + File app = new File(top, "gerrit-war/src/main/webapp"); + File webxml = new File(app, "WEB-INF/web.xml"); + + // Create a new web app in the war directory. + // + WebAppContext wac = + new MyWebAppContext(logger, warDir.getAbsolutePath(), "/"); + wac.setDescriptor(webxml.getAbsolutePath()); + + RequestLogHandler logHandler = new RequestLogHandler(); + logHandler.setRequestLog(new JettyRequestLogger(logger)); + logHandler.setHandler(wac); + server.setHandler(logHandler); + server.start(); + server.setStopAtShutdown(true); + + // Now that we're started, log to the top level logger. + Log.setLog(new JettyTreeLogger(logger)); + + return new JettyServletContainer(logger, server, wac, connector + .getLocalPort(), warDir); + } + + protected AbstractConnector getConnector() { + return new SelectChannelConnector(); + } + + private void checkStartParams(TreeLogger logger, int port, File appRootDir) { + if (logger == null) { + throw new NullPointerException("logger cannot be null"); + } + + if (port < 0 || port > 65535) { + throw new IllegalArgumentException( + "port must be either 0 (for auto) or less than 65536"); + } + + if (appRootDir == null) { + throw new NullPointerException("app root direcotry cannot be null"); + } + } +} diff --git a/gerrit-gwtui/.gitignore b/gerrit-gwtui/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-gwtui/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-gwtui/.settings/org.eclipse.core.resources.prefs b/gerrit-gwtui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-gwtui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-gwtui/.settings/org.eclipse.core.runtime.prefs b/gerrit-gwtui/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-gwtui/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-gwtui/.settings/org.eclipse.jdt.core.prefs b/gerrit-gwtui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-gwtui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-gwtui/.settings/org.eclipse.jdt.ui.prefs b/gerrit-gwtui/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-gwtui/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-gwtui/pom.xml b/gerrit-gwtui/pom.xml new file mode 100644 index 0000000000..7f14be565d --- /dev/null +++ b/gerrit-gwtui/pom.xml @@ -0,0 +1,259 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-gwtui + Gerrit Code Review - GWT UI + war + + + Web interface built on top of Google Web Toolkit + + + + + com.google.gwt + gwt-user + ${gwtVersion} + provided + + + + gwtexpui + gwtexpui + compile + + + gwtexpui + gwtexpui + compile + sources + jar + + + + gwtjsonrpc + gwtjsonrpc + compile + + + gwtjsonrpc + gwtjsonrpc + compile + sources + jar + + + + gwtorm + gwtorm + compile + + + gwtorm + gwtorm + compile + sources + jar + + + + com.google.gerrit + gerrit-reviewdb + compile + + + com.google.gerrit + gerrit-reviewdb + compile + sources + jar + + + + com.google.gerrit + gerrit-common + compile + + + com.google.gerrit + gerrit-common + compile + sources + jar + + + + com.google.gerrit + gerrit-patch-jgit + compile + + + com.google.gerrit + gerrit-patch-jgit + compile + sources + jar + + + + org.eclipse + jgit + compile + + + org.eclipse + jgit + compile + sources + jar + + + + com.google.gerrit + gerrit-patch-gwtexpui + compile + + + com.google.gerrit + gerrit-patch-gwtexpui + compile + sources + jar + + + + + + + org.codehaus.mojo + gwt-maven-plugin + 1.1 + + com.google.gerrit.GerritGwtUI + -Xmx512m + + + + + + compile + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + get-keyapplet + generate-resources + + unpack + + + + + gerrit + gerrit-keyapplet + true + ${project.build.directory}/gerrit-keyapplet + **/* + + + + + + + + + org.apache.maven.plugins + maven-war-plugin + + WEB-INF/classes/**,WEB-INF/lib/** + + false + + + + + + maven-antrun-plugin + + + compress-html + process-classes + + + + + + + + + + + + + + + + + + run + + + + + include-keyapplet + process-classes + + + + + + + + + + + + + + run + + + + + + + diff --git a/src/main/java/com/google/gerrit/Gerrit.gwt.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml similarity index 89% rename from src/main/java/com/google/gerrit/Gerrit.gwt.xml rename to gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml index ebb833fb23..dfdf3c495f 100644 --- a/src/main/java/com/google/gerrit/Gerrit.gwt.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml @@ -16,17 +16,16 @@ - - + + - diff --git a/src/main/java/com/google/gerrit/UserAgent.gwt.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/UserAgent.gwt.xml similarity index 100% rename from src/main/java/com/google/gerrit/UserAgent.gwt.xml rename to gerrit-gwtui/src/main/java/com/google/gerrit/UserAgent.gwt.xml diff --git a/src/main/java/com/google/gerrit/client/ErrorDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ErrorDialog.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ErrorDialog.java diff --git a/src/main/java/com/google/gerrit/client/FormatUtil.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java similarity index 97% rename from src/main/java/com/google/gerrit/client/FormatUtil.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java index d1b21d9ac3..281c72b696 100644 --- a/src/main/java/com/google/gerrit/client/FormatUtil.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/FormatUtil.java @@ -14,8 +14,8 @@ package com.google.gerrit.client; -import com.google.gerrit.client.data.AccountInfo; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.common.data.AccountInfo; +import com.google.gerrit.reviewdb.Account; import com.google.gwt.i18n.client.DateTimeFormat; import java.util.Date; diff --git a/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java similarity index 90% rename from src/main/java/com/google/gerrit/client/Gerrit.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java index 6b655b846d..08863d072a 100644 --- a/src/main/java/com/google/gerrit/client/Gerrit.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java @@ -16,14 +16,18 @@ package com.google.gerrit.client; import com.google.gerrit.client.auth.openid.OpenIdSignInDialog; import com.google.gerrit.client.auth.userpass.UserPassSignInDialog; -import com.google.gerrit.client.data.GerritConfig; -import com.google.gerrit.client.data.SystemInfoService; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGeneralPreferences; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.LinkMenuBar; import com.google.gerrit.client.ui.LinkMenuItem; import com.google.gerrit.client.ui.Screen; +import com.google.gerrit.common.Version; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.auth.SignInMode; +import com.google.gerrit.common.data.GerritConfig; +import com.google.gerrit.common.data.HostPageData; +import com.google.gerrit.common.data.SystemInfoService; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGeneralPreferences; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.JavaScriptObject; @@ -141,7 +145,7 @@ public class Gerrit implements EntryPoint { break; case OPENID: - new OpenIdSignInDialog(SignInDialog.Mode.SIGN_IN, null).center(); + new OpenIdSignInDialog(SignInMode.SIGN_IN, null).center(); break; case LDAP: @@ -274,7 +278,7 @@ public class Gerrit implements EntryPoint { public static String getVersion() { if (myVersion == null) { if (GWT.isScript()) { - final GerritVersion v = GWT.create(GerritVersion.class); + final Version v = GWT.create(Version.class); myVersion = v.version(); } else { myVersion = "dev"; @@ -291,14 +295,14 @@ public class Gerrit implements EntryPoint { sg.getElement().getParentElement().removeChild(sg.getElement()); RootPanel.detachNow(sg); - History.addValueChangeHandler(new Link()); + History.addValueChangeHandler(new HistoryHandler()); JumpKeys.register(body); if ("".equals(History.getToken())) { if (isSignedIn()) { - History.newItem(Link.MINE); + History.newItem(PageLinks.MINE); } else { - History.newItem(Link.ALL_OPEN); + History.newItem(PageLinks.ALL_OPEN); } } else { History.fireCurrentHistoryState(); @@ -313,16 +317,16 @@ public class Gerrit implements EntryPoint { LinkMenuBar m; m = new LinkMenuBar(); - addLink(m, C.menuAllOpen(), Link.ALL_OPEN); - addLink(m, C.menuAllMerged(), Link.ALL_MERGED); - addLink(m, C.menuAllAbandoned(), Link.ALL_ABANDONED); + addLink(m, C.menuAllOpen(), PageLinks.ALL_OPEN); + addLink(m, C.menuAllMerged(), PageLinks.ALL_MERGED); + addLink(m, C.menuAllAbandoned(), PageLinks.ALL_ABANDONED); menuLeft.add(m, C.menuAll()); if (signedIn) { m = new LinkMenuBar(); - addLink(m, C.menuMyChanges(), Link.MINE); - addLink(m, C.menyMyDrafts(), Link.MINE_DRAFTS); - addLink(m, C.menuMyStarredChanges(), Link.MINE_STARRED); + addLink(m, C.menuMyChanges(), PageLinks.MINE); + addLink(m, C.menyMyDrafts(), PageLinks.MINE_DRAFTS); + addLink(m, C.menuMyStarredChanges(), PageLinks.MINE_STARRED); menuLeft.add(m, C.menuMine()); menuLeft.selectTab(1); } else { @@ -331,14 +335,14 @@ public class Gerrit implements EntryPoint { if (signedIn) { m = new LinkMenuBar(); - addLink(m, C.menuGroups(), Link.ADMIN_GROUPS); - addLink(m, C.menuProjects(), Link.ADMIN_PROJECTS); + addLink(m, C.menuGroups(), PageLinks.ADMIN_GROUPS); + addLink(m, C.menuProjects(), PageLinks.ADMIN_PROJECTS); menuLeft.add(m, C.menuAdmin()); } if (signedIn) { whoAmI(); - addLink(menuRight, C.menuSettings(), Link.SETTINGS); + addLink(menuRight, C.menuSettings(), PageLinks.SETTINGS); menuRight.add(anchor(C.menuSignOut(), "logout")); } else { switch (getConfig().getAuthType()) { @@ -349,7 +353,7 @@ public class Gerrit implements EntryPoint { case OPENID: menuRight.addItem(C.menuRegister(), new Command() { public void execute() { - new OpenIdSignInDialog(SignInDialog.Mode.REGISTER, null).center(); + new OpenIdSignInDialog(SignInMode.REGISTER, null).center(); } }); // fall through diff --git a/src/main/java/com/google/gerrit/client/GerritConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java similarity index 100% rename from src/main/java/com/google/gerrit/client/GerritConstants.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java diff --git a/src/main/java/com/google/gerrit/client/GerritConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/GerritConstants.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties diff --git a/src/main/java/com/google/gerrit/client/GerritIcons.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritIcons.java similarity index 100% rename from src/main/java/com/google/gerrit/client/GerritIcons.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritIcons.java diff --git a/src/main/java/com/google/gerrit/client/GerritMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.java similarity index 100% rename from src/main/java/com/google/gerrit/client/GerritMessages.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.java diff --git a/src/main/java/com/google/gerrit/client/GerritMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/GerritMessages.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritMessages.properties diff --git a/src/main/java/com/google/gerrit/client/Link.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/HistoryHandler.java similarity index 79% rename from src/main/java/com/google/gerrit/client/Link.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/HistoryHandler.java index d5fda50a01..d238b4ad42 100644 --- a/src/main/java/com/google/gerrit/client/Link.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/HistoryHandler.java @@ -14,6 +14,17 @@ package com.google.gerrit.client; +import static com.google.gerrit.common.PageLinks.ADMIN_GROUPS; +import static com.google.gerrit.common.PageLinks.ADMIN_PROJECTS; +import static com.google.gerrit.common.PageLinks.ALL_OPEN; +import static com.google.gerrit.common.PageLinks.MINE; +import static com.google.gerrit.common.PageLinks.MINE_DRAFTS; +import static com.google.gerrit.common.PageLinks.MINE_STARRED; +import static com.google.gerrit.common.PageLinks.REGISTER; +import static com.google.gerrit.common.PageLinks.SETTINGS; +import static com.google.gerrit.common.PageLinks.SETTINGS_NEW_AGREEMENT; +import static com.google.gerrit.common.PageLinks.SETTINGS_WEBIDENT; + import com.google.gerrit.client.account.AccountSettings; import com.google.gerrit.client.account.NewAgreementScreen; import com.google.gerrit.client.account.RegisterScreen; @@ -36,61 +47,22 @@ import com.google.gerrit.client.changes.ChangeScreen; import com.google.gerrit.client.changes.MineDraftsScreen; import com.google.gerrit.client.changes.MineStarredScreen; import com.google.gerrit.client.changes.PublishCommentScreen; -import com.google.gerrit.client.data.AccountInfo; -import com.google.gerrit.client.data.ChangeInfo; import com.google.gerrit.client.patches.PatchScreen; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.Change.Status; import com.google.gerrit.client.ui.Screen; +import com.google.gerrit.common.auth.SignInMode; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.Change.Status; import com.google.gwt.core.client.GWT; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwtorm.client.KeyUtil; -public class Link implements ValueChangeHandler { - public static final String SETTINGS = "settings"; - public static final String SETTINGS_SSHKEYS = "settings,ssh-keys"; - public static final String SETTINGS_WEBIDENT = "settings,web-identities"; - public static final String SETTINGS_MYGROUPS = "settings,group-memberships"; - public static final String SETTINGS_AGREEMENTS = "settings,agreements"; - public static final String SETTINGS_CONTACT = "settings,contact"; - public static final String SETTINGS_PROJECTS = "settings,projects"; - public static final String SETTINGS_NEW_AGREEMENT = "settings,new-agreement"; - public static final String REGISTER = "register"; - - public static final String MINE = "mine"; - public static final String MINE_STARRED = "mine,starred"; - public static final String MINE_DRAFTS = "mine,drafts"; - - public static final String ALL_ABANDONED = "all,abandoned,n,z"; - public static final String ALL_MERGED = "all,merged,n,z"; - public static final String ALL_OPEN = "all,open,n,z"; - - public static final String ADMIN_PEOPLE = "admin,people"; - public static final String ADMIN_GROUPS = "admin,groups"; - public static final String ADMIN_PROJECTS = "admin,projects"; - - public static String toChange(final ChangeInfo c) { - return toChange(c.getId()); - } - - public static String toChange(final Change.Id c) { - return "change," + c.toString(); - } - - public static String toAccountDashboard(final AccountInfo acct) { - return toAccountDashboard(acct.getId()); - } - - public static String toAccountDashboard(final Account.Id acct) { - return "dashboard," + acct.toString(); - } - +public class HistoryHandler implements ValueChangeHandler { public static String toPatchSideBySide(final Patch.Key id) { return toPatch("sidebyside", id); } @@ -126,10 +98,6 @@ public class Link implements ValueChangeHandler { } } - public static String toChangeQuery(final String query) { - return "q," + KeyUtil.encode(query) + ",n,z"; - } - @Override public void onValueChange(final ValueChangeEvent event) { final String token = event.getValue(); @@ -295,7 +263,7 @@ public class Link implements ValueChangeHandler { p = "SignInFailure,"; if (token.startsWith(p)) { final String[] args = skip(p, token).split(","); - final SignInDialog.Mode mode = SignInDialog.Mode.valueOf(args[0]); + final SignInMode mode = SignInMode.valueOf(args[0]); final String msg = KeyUtil.decode(args[1]); switch (Gerrit.getConfig().getAuthType()) { case OPENID: diff --git a/src/main/java/com/google/gerrit/client/HostPageDataService.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/HostPageDataService.java similarity index 95% rename from src/main/java/com/google/gerrit/client/HostPageDataService.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/HostPageDataService.java index 3553d9fe37..cb3a7e639f 100644 --- a/src/main/java/com/google/gerrit/client/HostPageDataService.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/HostPageDataService.java @@ -14,6 +14,7 @@ package com.google.gerrit.client; +import com.google.gerrit.common.data.HostPageData; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.HostPageCache; import com.google.gwtjsonrpc.client.RemoteJsonService; diff --git a/src/main/java/com/google/gerrit/client/JumpKeys.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java similarity index 87% rename from src/main/java/com/google/gerrit/client/JumpKeys.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java index ebd50686db..62f5b3baa9 100644 --- a/src/main/java/com/google/gerrit/client/JumpKeys.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java @@ -14,6 +14,7 @@ package com.google.gerrit.client; +import com.google.gerrit.common.PageLinks; import com.google.gwt.event.dom.client.KeyPressEvent; import com.google.gwt.user.client.ui.Widget; import com.google.gwtexpui.globalkey.client.CompoundKeyCommand; @@ -28,13 +29,13 @@ class JumpKeys { jumps.add(new KeyCommand(0, 'o', Gerrit.C.jumpAllOpen()) { @Override public void onKeyPress(final KeyPressEvent event) { - Gerrit.display(Link.ALL_OPEN, true); + Gerrit.display(PageLinks.ALL_OPEN, true); } }); jumps.add(new KeyCommand(0, 'm', Gerrit.C.jumpAllMerged()) { @Override public void onKeyPress(final KeyPressEvent event) { - Gerrit.display(Link.ALL_MERGED, true); + Gerrit.display(PageLinks.ALL_MERGED, true); } }); @@ -42,19 +43,19 @@ class JumpKeys { jumps.add(new KeyCommand(0, 'i', Gerrit.C.jumpMine()) { @Override public void onKeyPress(final KeyPressEvent event) { - Gerrit.display(Link.MINE, true); + Gerrit.display(PageLinks.MINE, true); } }); jumps.add(new KeyCommand(0, 'd', Gerrit.C.jumpMineDrafts()) { @Override public void onKeyPress(final KeyPressEvent event) { - Gerrit.display(Link.MINE_DRAFTS, true); + Gerrit.display(PageLinks.MINE_DRAFTS, true); } }); jumps.add(new KeyCommand(0, 's', Gerrit.C.jumpMineStarred()) { @Override public void onKeyPress(final KeyPressEvent event) { - Gerrit.display(Link.MINE_STARRED, true); + Gerrit.display(PageLinks.MINE_STARRED, true); } }); } diff --git a/src/main/java/com/google/gerrit/client/NotFoundScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/NotFoundScreen.java similarity index 100% rename from src/main/java/com/google/gerrit/client/NotFoundScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/NotFoundScreen.java diff --git a/src/main/java/com/google/gerrit/client/NotSignedInDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/NotSignedInDialog.java similarity index 100% rename from src/main/java/com/google/gerrit/client/NotSignedInDialog.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/NotSignedInDialog.java diff --git a/src/main/java/com/google/gerrit/client/RpcStatus.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java similarity index 100% rename from src/main/java/com/google/gerrit/client/RpcStatus.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/RpcStatus.java diff --git a/src/main/java/com/google/gerrit/client/SearchPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java similarity index 95% rename from src/main/java/com/google/gerrit/client/SearchPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java index 5b40972022..d61b9614d1 100644 --- a/src/main/java/com/google/gerrit/client/SearchPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchPanel.java @@ -15,7 +15,8 @@ package com.google.gerrit.client; import com.google.gerrit.client.changes.ChangeScreen; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.reviewdb.Change; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ClickEvent; @@ -136,9 +137,9 @@ class SearchPanel extends Composite { if (query.matches("^[1-9][0-9]*$")) { final Change.Id ck = Change.Id.parse(query); - Gerrit.display(Link.toChange(ck), new ChangeScreen(ck)); + Gerrit.display(PageLinks.toChange(ck), new ChangeScreen(ck)); } else { - Gerrit.display(Link.toChangeQuery(query), true); + Gerrit.display(PageLinks.toChangeQuery(query), true); } } } diff --git a/src/main/java/com/google/gerrit/client/SignInDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SignInDialog.java similarity index 89% rename from src/main/java/com/google/gerrit/client/SignInDialog.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/SignInDialog.java index 1226533b46..fb6f9ea1eb 100644 --- a/src/main/java/com/google/gerrit/client/SignInDialog.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SignInDialog.java @@ -14,22 +14,19 @@ package com.google.gerrit.client; +import com.google.gerrit.common.auth.SignInMode; import com.google.gwtexpui.user.client.AutoCenterDialogBox; /** Prompts the user to sign in to their account. */ public abstract class SignInDialog extends AutoCenterDialogBox { - public static enum Mode { - SIGN_IN, LINK_IDENTIY, REGISTER; - } - - protected final SignInDialog.Mode mode; + protected final SignInMode mode; /** * Create a new dialog to handle user sign in. * * @param signInMode type of mode the login will perform. */ - protected SignInDialog(final Mode signInMode) { + protected SignInDialog(final SignInMode signInMode) { super(/* auto hide */true, /* modal */true); mode = signInMode; diff --git a/src/main/java/com/google/gerrit/client/account/AccountConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java similarity index 100% rename from src/main/java/com/google/gerrit/client/account/AccountConstants.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java diff --git a/src/main/java/com/google/gerrit/client/account/AccountConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/account/AccountConstants.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties diff --git a/src/main/java/com/google/gerrit/client/account/AccountMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountMessages.java similarity index 100% rename from src/main/java/com/google/gerrit/client/account/AccountMessages.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountMessages.java diff --git a/src/main/java/com/google/gerrit/client/account/AccountMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountMessages.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/account/AccountMessages.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountMessages.properties diff --git a/src/main/java/com/google/gerrit/client/account/AccountSettings.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountSettings.java similarity index 91% rename from src/main/java/com/google/gerrit/client/account/AccountSettings.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountSettings.java index 718e0b604a..e6aa43009d 100644 --- a/src/main/java/com/google/gerrit/client/account/AccountSettings.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountSettings.java @@ -17,9 +17,9 @@ package com.google.gerrit.client.account; import static com.google.gerrit.client.FormatUtil.mediumFormat; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.reviewdb.Account; import com.google.gerrit.client.ui.AccountScreen; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.reviewdb.Account; import com.google.gwt.event.logical.shared.SelectionEvent; import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.i18n.client.LocaleInfo; @@ -92,7 +92,7 @@ public class AccountSettings extends AccountScreen { return new PreferencePanel(); } }, Util.C.tabPreferences()); - tabTokens.add(Link.SETTINGS); + tabTokens.add(PageLinks.SETTINGS); tabs.add(new LazyPanel() { @Override @@ -100,7 +100,7 @@ public class AccountSettings extends AccountScreen { return new ProjectWatchPanel(); } }, Util.C.watchedProjects()); - tabTokens.add(Link.SETTINGS_PROJECTS); + tabTokens.add(PageLinks.SETTINGS_PROJECTS); tabs.add(new LazyPanel() { @Override @@ -110,7 +110,7 @@ public class AccountSettings extends AccountScreen { return p; } }, Util.C.tabContactInformation()); - tabTokens.add(Link.SETTINGS_CONTACT); + tabTokens.add(PageLinks.SETTINGS_CONTACT); tabs.add(new LazyPanel() { @Override @@ -118,7 +118,7 @@ public class AccountSettings extends AccountScreen { return new SshPanel(); } }, Util.C.tabSshKeys()); - tabTokens.add(Link.SETTINGS_SSHKEYS); + tabTokens.add(PageLinks.SETTINGS_SSHKEYS); tabs.add(new LazyPanel() { @Override @@ -126,7 +126,7 @@ public class AccountSettings extends AccountScreen { return new ExternalIdPanel(); } }, Util.C.tabWebIdentities()); - tabTokens.add(Link.SETTINGS_WEBIDENT); + tabTokens.add(PageLinks.SETTINGS_WEBIDENT); tabs.add(new LazyPanel() { @Override @@ -134,7 +134,7 @@ public class AccountSettings extends AccountScreen { return new MyGroupsPanel(); } }, Util.C.tabMyGroups()); - tabTokens.add(Link.SETTINGS_MYGROUPS); + tabTokens.add(PageLinks.SETTINGS_MYGROUPS); if (Gerrit.getConfig().isUseContributorAgreements()) { tabs.add(new LazyPanel() { @@ -143,7 +143,7 @@ public class AccountSettings extends AccountScreen { return new AgreementPanel(); } }, Util.C.tabAgreements()); - tabTokens.add(Link.SETTINGS_AGREEMENTS); + tabTokens.add(PageLinks.SETTINGS_AGREEMENTS); } tabs.addSelectionHandler(new SelectionHandler() { diff --git a/src/main/java/com/google/gerrit/client/account/AgreementPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AgreementPanel.java similarity index 91% rename from src/main/java/com/google/gerrit/client/account/AgreementPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AgreementPanel.java index 27ac0bb47e..315a24b37c 100644 --- a/src/main/java/com/google/gerrit/client/account/AgreementPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AgreementPanel.java @@ -15,13 +15,14 @@ package com.google.gerrit.client.account; import com.google.gerrit.client.FormatUtil; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.reviewdb.AbstractAgreement; -import com.google.gerrit.client.reviewdb.AccountAgreement; -import com.google.gerrit.client.reviewdb.AccountGroupAgreement; -import com.google.gerrit.client.reviewdb.ContributorAgreement; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.FancyFlexTable; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.AgreementInfo; +import com.google.gerrit.reviewdb.AbstractAgreement; +import com.google.gerrit.reviewdb.AccountAgreement; +import com.google.gerrit.reviewdb.AccountGroupAgreement; +import com.google.gerrit.reviewdb.ContributorAgreement; import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; @@ -38,7 +39,7 @@ class AgreementPanel extends Composite { agreements = new AgreementTable(); body.add(agreements); - body.add(new Hyperlink(Util.C.newAgreement(), Link.SETTINGS_NEW_AGREEMENT)); + body.add(new Hyperlink(Util.C.newAgreement(), PageLinks.SETTINGS_NEW_AGREEMENT)); initWidget(body); } diff --git a/src/main/java/com/google/gerrit/client/account/ContactPanelFull.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelFull.java similarity index 97% rename from src/main/java/com/google/gerrit/client/account/ContactPanelFull.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelFull.java index 13a66415a6..16f23b5e7b 100644 --- a/src/main/java/com/google/gerrit/client/account/ContactPanelFull.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelFull.java @@ -15,9 +15,9 @@ package com.google.gerrit.client.account; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ContactInformation; import com.google.gerrit.client.ui.TextSaveButtonListener; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ContactInformation; import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Label; diff --git a/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java similarity index 98% rename from src/main/java/com/google/gerrit/client/account/ContactPanelShort.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java index 7995006fd3..f6ca6b247c 100644 --- a/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java @@ -15,11 +15,11 @@ package com.google.gerrit.client.account; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.ContactInformation; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.TextSaveButtonListener; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.ContactInformation; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; diff --git a/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java similarity index 95% rename from src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java index 56ad107b2b..fc3d9443ef 100644 --- a/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ExternalIdPanel.java @@ -16,12 +16,13 @@ package com.google.gerrit.client.account; import com.google.gerrit.client.FormatUtil; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.SignInDialog; import com.google.gerrit.client.auth.openid.OpenIdSignInDialog; import com.google.gerrit.client.auth.openid.OpenIdUtil; -import com.google.gerrit.client.reviewdb.AccountExternalId; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.FancyFlexTable; +import com.google.gerrit.common.auth.SignInMode; +import com.google.gerrit.common.auth.openid.OpenIdUrls; +import com.google.gerrit.reviewdb.AccountExternalId; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Button; @@ -61,7 +62,7 @@ class ExternalIdPanel extends Composite { linkIdentity.addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - new OpenIdSignInDialog(SignInDialog.Mode.LINK_IDENTIY, null).center(); + new OpenIdSignInDialog(SignInMode.LINK_IDENTIY, null).center(); } }); body.add(linkIdentity); @@ -225,10 +226,10 @@ class ExternalIdPanel extends Composite { // return ""; - } else if (k.isScheme(OpenIdUtil.URL_GOOGLE)) { + } else if (k.isScheme(OpenIdUrls.URL_GOOGLE)) { return OpenIdUtil.C.nameGoogle(); - } else if (k.isScheme(OpenIdUtil.URL_YAHOO)) { + } else if (k.isScheme(OpenIdUrls.URL_YAHOO)) { return OpenIdUtil.C.nameYahoo(); } else if (k.isScheme(AccountExternalId.LEGACY_GAE)) { diff --git a/src/main/java/com/google/gerrit/client/account/MyGroupsPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyGroupsPanel.java similarity index 96% rename from src/main/java/com/google/gerrit/client/account/MyGroupsPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyGroupsPanel.java index 6e7e32bb8c..9ba20e82bf 100644 --- a/src/main/java/com/google/gerrit/client/account/MyGroupsPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyGroupsPanel.java @@ -15,8 +15,8 @@ package com.google.gerrit.client.account; import com.google.gerrit.client.admin.GroupTable; -import com.google.gerrit.client.reviewdb.AccountGroup; import com.google.gerrit.client.rpc.GerritCallback; +import com.google.gerrit.reviewdb.AccountGroup; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; diff --git a/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java similarity index 96% rename from src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java index 64e6f33bbc..9582103a73 100644 --- a/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/NewAgreementScreen.java @@ -16,14 +16,15 @@ package com.google.gerrit.client.account; import com.google.gerrit.client.ErrorDialog; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.reviewdb.AccountAgreement; -import com.google.gerrit.client.reviewdb.AccountGroupAgreement; -import com.google.gerrit.client.reviewdb.ContributorAgreement; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.AccountScreen; import com.google.gerrit.client.ui.SmallHeading; import com.google.gerrit.client.ui.TextSaveButtonListener; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.AgreementInfo; +import com.google.gerrit.reviewdb.AccountAgreement; +import com.google.gerrit.reviewdb.AccountGroupAgreement; +import com.google.gerrit.reviewdb.ContributorAgreement; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -71,7 +72,7 @@ public class NewAgreementScreen extends AccountScreen { } public NewAgreementScreen(final String token) { - nextToken = token != null ? token : Link.SETTINGS_AGREEMENTS; + nextToken = token != null ? token : PageLinks.SETTINGS_AGREEMENTS; } @Override diff --git a/src/main/java/com/google/gerrit/client/account/PreferencePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/PreferencePanel.java similarity index 91% rename from src/main/java/com/google/gerrit/client/account/PreferencePanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/PreferencePanel.java index 9102f66184..583aa2a8a2 100644 --- a/src/main/java/com/google/gerrit/client/account/PreferencePanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/PreferencePanel.java @@ -14,16 +14,16 @@ package com.google.gerrit.client.account; -import static com.google.gerrit.client.reviewdb.AccountGeneralPreferences.CONTEXT_CHOICES; -import static com.google.gerrit.client.reviewdb.AccountGeneralPreferences.DEFAULT_CONTEXT; -import static com.google.gerrit.client.reviewdb.AccountGeneralPreferences.DEFAULT_PAGESIZE; -import static com.google.gerrit.client.reviewdb.AccountGeneralPreferences.PAGESIZE_CHOICES; -import static com.google.gerrit.client.reviewdb.AccountGeneralPreferences.WHOLE_FILE_CONTEXT; +import static com.google.gerrit.reviewdb.AccountGeneralPreferences.CONTEXT_CHOICES; +import static com.google.gerrit.reviewdb.AccountGeneralPreferences.DEFAULT_CONTEXT; +import static com.google.gerrit.reviewdb.AccountGeneralPreferences.DEFAULT_PAGESIZE; +import static com.google.gerrit.reviewdb.AccountGeneralPreferences.PAGESIZE_CHOICES; +import static com.google.gerrit.reviewdb.AccountGeneralPreferences.WHOLE_FILE_CONTEXT; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGeneralPreferences; import com.google.gerrit.client.rpc.GerritCallback; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGeneralPreferences; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; diff --git a/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java similarity index 98% rename from src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java index aa45522cf8..8b674cea7a 100644 --- a/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ProjectWatchPanel.java @@ -14,12 +14,13 @@ package com.google.gerrit.client.account; -import com.google.gerrit.client.reviewdb.AccountProjectWatch; -import com.google.gerrit.client.reviewdb.Change.Status; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.FancyFlexTable; -import com.google.gerrit.client.ui.ProjectNameSuggestOracle; import com.google.gerrit.client.ui.ProjectLink; +import com.google.gerrit.client.ui.ProjectNameSuggestOracle; +import com.google.gerrit.common.data.AccountProjectWatchInfo; +import com.google.gerrit.reviewdb.AccountProjectWatch; +import com.google.gerrit.reviewdb.Change.Status; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ClickEvent; diff --git a/src/main/java/com/google/gerrit/client/account/RegisterScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java similarity index 95% rename from src/main/java/com/google/gerrit/client/account/RegisterScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java index 918b906316..fd2a89d540 100644 --- a/src/main/java/com/google/gerrit/client/account/RegisterScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java @@ -15,10 +15,10 @@ package com.google.gerrit.client.account; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.reviewdb.Account; import com.google.gerrit.client.ui.AccountScreen; import com.google.gerrit.client.ui.SmallHeading; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.reviewdb.Account; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FormPanel; import com.google.gwt.user.client.ui.HTML; @@ -89,7 +89,7 @@ public class RegisterScreen extends AccountScreen { agreementGroup.add(whyAgreement); choices.add(new InlineHyperlink(Util.C.newAgreement(), - Link.SETTINGS_NEW_AGREEMENT + "," + nextToken)); + PageLinks.SETTINGS_NEW_AGREEMENT + "," + nextToken)); choices .add(new InlineHyperlink(Util.C.welcomeAgreementLater(), nextToken)); formBody.add(agreementGroup); diff --git a/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java similarity index 97% rename from src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java index 1b376bd99c..175cb05a52 100644 --- a/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshHostKeyPanel.java @@ -14,8 +14,8 @@ package com.google.gerrit.client.account; -import com.google.gerrit.client.data.SshHostKey; import com.google.gerrit.client.ui.SmallHeading; +import com.google.gerrit.common.data.SshHostKey; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; diff --git a/src/main/java/com/google/gerrit/client/account/SshPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java similarity index 98% rename from src/main/java/com/google/gerrit/client/account/SshPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java index 0e34617af0..d49c61c4a1 100644 --- a/src/main/java/com/google/gerrit/client/account/SshPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/SshPanel.java @@ -17,15 +17,15 @@ package com.google.gerrit.client.account; import com.google.gerrit.client.ErrorDialog; import com.google.gerrit.client.FormatUtil; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.data.SshHostKey; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountSshKey; import com.google.gerrit.client.rpc.GerritCallback; -import com.google.gerrit.client.rpc.InvalidSshKeyException; -import com.google.gerrit.client.rpc.InvalidSshUserNameException; import com.google.gerrit.client.ui.FancyFlexTable; import com.google.gerrit.client.ui.SmallHeading; import com.google.gerrit.client.ui.TextSaveButtonListener; +import com.google.gerrit.common.data.SshHostKey; +import com.google.gerrit.common.errors.InvalidSshKeyException; +import com.google.gerrit.common.errors.InvalidSshUserNameException; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountSshKey; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ClickEvent; diff --git a/src/main/java/com/google/gerrit/client/account/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/Util.java similarity index 92% rename from src/main/java/com/google/gerrit/client/account/Util.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/Util.java index 0f50b0e9c9..5ed79e6716 100644 --- a/src/main/java/com/google/gerrit/client/account/Util.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/Util.java @@ -14,6 +14,8 @@ package com.google.gerrit.client.account; +import com.google.gerrit.common.data.AccountSecurity; +import com.google.gerrit.common.data.AccountService; import com.google.gwt.core.client.GWT; import com.google.gwtjsonrpc.client.JsonUtil; diff --git a/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java similarity index 93% rename from src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java index 6acdd37e35..db9d718894 100644 --- a/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ValidateEmailScreen.java @@ -14,9 +14,9 @@ package com.google.gerrit.client.account; -import com.google.gerrit.client.Link; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.AccountScreen; +import com.google.gerrit.common.PageLinks; import com.google.gwt.user.client.History; import com.google.gwtjsonrpc.client.VoidResult; @@ -44,7 +44,7 @@ public class ValidateEmailScreen extends AccountScreen { @Override protected void postDisplay() { - History.newItem(Link.SETTINGS_CONTACT, true); + History.newItem(PageLinks.SETTINGS_CONTACT, true); } }); } diff --git a/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java similarity index 98% rename from src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java index fedf1f4590..42fb296c32 100644 --- a/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccountGroupScreen.java @@ -15,10 +15,6 @@ package com.google.gerrit.client.admin; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountGroupMember; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.AccountDashboardLink; @@ -28,6 +24,11 @@ import com.google.gerrit.client.ui.AddMemberBox; import com.google.gerrit.client.ui.FancyFlexTable; import com.google.gerrit.client.ui.SmallHeading; import com.google.gerrit.client.ui.TextSaveButtonListener; +import com.google.gerrit.common.data.AccountInfoCache; +import com.google.gerrit.common.data.GroupDetail; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroupMember; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; diff --git a/src/main/java/com/google/gerrit/client/admin/AdminConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java similarity index 100% rename from src/main/java/com/google/gerrit/client/admin/AdminConstants.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.java diff --git a/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/admin/AdminConstants.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties diff --git a/src/main/java/com/google/gerrit/client/admin/AdminMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.java similarity index 100% rename from src/main/java/com/google/gerrit/client/admin/AdminMessages.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.java diff --git a/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/admin/AdminMessages.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminMessages.properties diff --git a/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java similarity index 90% rename from src/main/java/com/google/gerrit/client/admin/GroupListScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java index 5bd5a87043..b00491fb02 100644 --- a/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java @@ -14,12 +14,13 @@ package com.google.gerrit.client.admin; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.client.HistoryHandler; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.AccountScreen; import com.google.gerrit.client.ui.SmallHeading; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.reviewdb.AccountGroup; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.History; @@ -53,7 +54,7 @@ public class GroupListScreen extends AccountScreen { super.onInitUI(); setPageTitle(Util.C.groupListTitle()); - groups = new GroupTable(true /* hyperlink to admin */, Link.ADMIN_GROUPS); + groups = new GroupTable(true /* hyperlink to admin */, PageLinks.ADMIN_GROUPS); add(groups); final VerticalPanel fp = new VerticalPanel(); @@ -89,7 +90,7 @@ public class GroupListScreen extends AccountScreen { Util.GROUP_SVC.createGroup(newName, new GerritCallback() { public void onSuccess(final AccountGroup.Id result) { - History.newItem(Link.toAccountGroup(result)); + History.newItem(HistoryHandler.toAccountGroup(result)); } }); } diff --git a/src/main/java/com/google/gerrit/client/admin/GroupTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java similarity index 92% rename from src/main/java/com/google/gerrit/client/admin/GroupTable.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java index 613a4056af..24e31c0af8 100644 --- a/src/main/java/com/google/gerrit/client/admin/GroupTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java @@ -14,9 +14,9 @@ package com.google.gerrit.client.admin; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.client.HistoryHandler; import com.google.gerrit.client.ui.NavigationTable; +import com.google.gerrit.reviewdb.AccountGroup; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.KeyCodes; @@ -70,7 +70,7 @@ public class GroupTable extends NavigationTable { @Override protected void onOpenRow(final int row) { - History.newItem(Link.toAccountGroup(getRowItem(row).getId())); + History.newItem(HistoryHandler.toAccountGroup(getRowItem(row).getId())); } public void display(final List result) { @@ -87,7 +87,7 @@ public class GroupTable extends NavigationTable { void populate(final int row, final AccountGroup k) { if (enableLink) { - table.setWidget(row, 1, new Hyperlink(k.getName(), Link.toAccountGroup(k + table.setWidget(row, 1, new Hyperlink(k.getName(), HistoryHandler.toAccountGroup(k .getId()))); } else { table.setText(row, 1, k.getName()); diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java similarity index 89% rename from src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java index 9a02778733..ed4acd682f 100644 --- a/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java @@ -15,10 +15,11 @@ package com.google.gerrit.client.admin; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.client.HistoryHandler; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.AccountScreen; +import com.google.gerrit.common.data.ProjectDetail; +import com.google.gerrit.reviewdb.Project; import com.google.gwt.event.logical.shared.SelectionEvent; import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.user.client.ui.LazyPanel; @@ -70,7 +71,7 @@ public class ProjectAdminScreen extends AccountScreen { return new ProjectInfoPanel(projectName); } }, Util.C.projectAdminTabGeneral()); - tabTokens.add(Link.toProjectAdmin(projectName, INFO_TAB)); + tabTokens.add(HistoryHandler.toProjectAdmin(projectName, INFO_TAB)); if (!Gerrit.getConfig().getWildProject().equals(projectName)) { tabs.add(new LazyPanel() { @@ -79,7 +80,7 @@ public class ProjectAdminScreen extends AccountScreen { return new ProjectBranchesPanel(projectName); } }, Util.C.projectAdminTabBranches()); - tabTokens.add(Link.toProjectAdmin(projectName, BRANCH_TAB)); + tabTokens.add(HistoryHandler.toProjectAdmin(projectName, BRANCH_TAB)); } tabs.add(new LazyPanel() { @@ -88,7 +89,7 @@ public class ProjectAdminScreen extends AccountScreen { return new ProjectRightsPanel(projectName); } }, Util.C.projectAdminTabAccess()); - tabTokens.add(Link.toProjectAdmin(projectName, ACCESS_TAB)); + tabTokens.add(HistoryHandler.toProjectAdmin(projectName, ACCESS_TAB)); tabs.addSelectionHandler(new SelectionHandler() { @Override diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java similarity index 97% rename from src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java index c3fbe50b0a..080ba8c380 100644 --- a/src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesPanel.java @@ -15,13 +15,13 @@ package com.google.gerrit.client.admin; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.data.GitwebLink; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Project; import com.google.gerrit.client.rpc.GerritCallback; -import com.google.gerrit.client.rpc.InvalidNameException; -import com.google.gerrit.client.rpc.InvalidRevisionException; import com.google.gerrit.client.ui.FancyFlexTable; +import com.google.gerrit.common.data.GitwebLink; +import com.google.gerrit.common.errors.InvalidNameException; +import com.google.gerrit.common.errors.InvalidRevisionException; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Project; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ClickEvent; diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java similarity index 98% rename from src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java index cc2b3fee33..ea5fba64f4 100644 --- a/src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoPanel.java @@ -15,10 +15,11 @@ package com.google.gerrit.client.admin; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.reviewdb.Project; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.SmallHeading; import com.google.gerrit.client.ui.TextSaveButtonListener; +import com.google.gerrit.common.data.ProjectDetail; +import com.google.gerrit.reviewdb.Project; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java similarity index 93% rename from src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java index bfec747061..624efbd8f5 100644 --- a/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java @@ -14,12 +14,13 @@ package com.google.gerrit.client.admin; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.client.HistoryHandler; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.AccountScreen; import com.google.gerrit.client.ui.NavigationTable; import com.google.gerrit.client.ui.SmallHeading; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.reviewdb.Project; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.KeyCodes; @@ -67,7 +68,7 @@ public class ProjectListScreen extends AccountScreen { private class ProjectTable extends NavigationTable { ProjectTable() { - setSavePointerId(Link.ADMIN_PROJECTS); + setSavePointerId(PageLinks.ADMIN_PROJECTS); keysNavigation.add(new PrevKeyCommand(0, 'k', Util.C.projectListPrev())); keysNavigation.add(new NextKeyCommand(0, 'j', Util.C.projectListNext())); keysNavigation.add(new OpenKeyCommand(0, 'o', Util.C.projectListOpen())); @@ -103,7 +104,7 @@ public class ProjectListScreen extends AccountScreen { } private String link(final Project item) { - return Link.toProjectAdmin(item.getNameKey(), ProjectAdminScreen.INFO_TAB); + return HistoryHandler.toProjectAdmin(item.getNameKey(), ProjectAdminScreen.INFO_TAB); } void display(final List result) { diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java similarity index 97% rename from src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java index dc453a6bdc..510d478712 100644 --- a/src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectRightsPanel.java @@ -15,17 +15,18 @@ package com.google.gerrit.client.admin; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.GerritConfig; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.AccountGroupSuggestOracle; import com.google.gerrit.client.ui.FancyFlexTable; import com.google.gerrit.client.ui.SmallHeading; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.GerritConfig; +import com.google.gerrit.common.data.ProjectDetail; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ChangeEvent; diff --git a/src/main/java/com/google/gerrit/client/admin/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java similarity index 91% rename from src/main/java/com/google/gerrit/client/admin/Util.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java index 7632e60f6f..41671161aa 100644 --- a/src/main/java/com/google/gerrit/client/admin/Util.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/Util.java @@ -14,7 +14,9 @@ package com.google.gerrit.client.admin; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.common.data.GroupAdminService; +import com.google.gerrit.common.data.ProjectAdminService; +import com.google.gerrit.reviewdb.Project; import com.google.gwt.core.client.GWT; import com.google.gwtjsonrpc.client.JsonUtil; diff --git a/src/main/java/com/google/gerrit/client/arrowRight.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowRight.gif similarity index 100% rename from src/main/java/com/google/gerrit/client/arrowRight.gif rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowRight.gif diff --git a/src/main/java/com/google/gerrit/client/auth/openid/LoginConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/LoginConstants.java similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/openid/LoginConstants.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/LoginConstants.java diff --git a/src/main/java/com/google/gerrit/client/auth/openid/LoginConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/LoginConstants.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/openid/LoginConstants.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/LoginConstants.properties diff --git a/src/main/java/com/google/gerrit/client/auth/openid/LoginIcons.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/LoginIcons.java similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/openid/LoginIcons.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/LoginIcons.java diff --git a/src/main/java/com/google/gerrit/client/auth/openid/LoginMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/LoginMessages.java similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/openid/LoginMessages.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/LoginMessages.java diff --git a/src/main/java/com/google/gerrit/client/auth/openid/LoginMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/LoginMessages.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/openid/LoginMessages.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/LoginMessages.properties diff --git a/src/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java similarity index 95% rename from src/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java index a3a6222bd2..bcb793bdc7 100644 --- a/src/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/OpenIdSignInDialog.java @@ -17,6 +17,9 @@ package com.google.gerrit.client.auth.openid; import com.google.gerrit.client.SignInDialog; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.SmallHeading; +import com.google.gerrit.common.auth.SignInMode; +import com.google.gerrit.common.auth.openid.DiscoveryResult; +import com.google.gerrit.common.auth.openid.OpenIdUrls; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.FormElement; import com.google.gwt.event.dom.client.ClickEvent; @@ -62,7 +65,7 @@ public class OpenIdSignInDialog extends SignInDialog implements private CheckBox rememberId; private boolean discovering; - public OpenIdSignInDialog(final SignInDialog.Mode requestedMode, + public OpenIdSignInDialog(final SignInMode requestedMode, final String initialErrorMsg) { super(requestedMode); @@ -91,8 +94,8 @@ public class OpenIdSignInDialog extends SignInDialog implements createErrorBox(); createIdentBox(); - link(OpenIdUtil.URL_GOOGLE, OpenIdUtil.C.nameGoogle(), icons.iconGoogle()); - link(OpenIdUtil.URL_YAHOO, OpenIdUtil.C.nameYahoo(), icons.iconYahoo()); + link(OpenIdUrls.URL_GOOGLE, OpenIdUtil.C.nameGoogle(), icons.iconGoogle()); + link(OpenIdUrls.URL_YAHOO, OpenIdUtil.C.nameYahoo(), icons.iconYahoo()); if (initialErrorMsg != null) { showError(initialErrorMsg); @@ -202,12 +205,12 @@ public class OpenIdSignInDialog extends SignInDialog implements login.setTabIndex(2); line1.add(login); - if (mode == SignInDialog.Mode.SIGN_IN) { + if (mode == SignInMode.SIGN_IN) { rememberId = new CheckBox(OpenIdUtil.C.rememberMe()); rememberId.setTabIndex(1); group.add(rememberId); - final String last = Cookies.getCookie(OpenIdUtil.LASTID_COOKIE); + final String last = Cookies.getCookie(OpenIdUrls.LASTID_COOKIE); if (last != null && !"".equals(last)) { providerId.setText(last); rememberId.setValue(true); diff --git a/src/main/java/com/google/gerrit/client/auth/openid/OpenIdUtil.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/OpenIdUtil.java similarity index 61% rename from src/main/java/com/google/gerrit/client/auth/openid/OpenIdUtil.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/OpenIdUtil.java index d9a7c40a14..879265d559 100644 --- a/src/main/java/com/google/gerrit/client/auth/openid/OpenIdUtil.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/OpenIdUtil.java @@ -14,6 +14,7 @@ package com.google.gerrit.client.auth.openid; +import com.google.gerrit.common.auth.openid.OpenIdService; import com.google.gwt.core.client.GWT; import com.google.gwtjsonrpc.client.JsonUtil; @@ -22,23 +23,10 @@ public class OpenIdUtil { public static final LoginMessages M; public static final OpenIdService SVC; - public static final String OPENID_IDENTIFIER = "openid_identifier"; - public static final String LASTID_COOKIE = "gerrit.last_openid"; - - public static final String URL_YAHOO = "https://me.yahoo.com"; - public static final String URL_GOOGLE = - "https://www.google.com/accounts/o8/id"; - static { - if (GWT.isClient()) { - C = GWT.create(LoginConstants.class); - M = GWT.create(LoginMessages.class); - SVC = GWT.create(OpenIdService.class); - JsonUtil.bind(SVC, "rpc/OpenIdService"); - } else { - C = null; - M = null; - SVC = null; - } + C = GWT.create(LoginConstants.class); + M = GWT.create(LoginMessages.class); + SVC = GWT.create(OpenIdService.class); + JsonUtil.bind(SVC, "rpc/OpenIdService"); } } diff --git a/src/main/java/com/google/gerrit/client/auth/openid/iconGoogle.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/iconGoogle.gif similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/openid/iconGoogle.gif rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/iconGoogle.gif diff --git a/src/main/java/com/google/gerrit/client/auth/openid/iconYahoo.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/iconYahoo.gif similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/openid/iconYahoo.gif rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/iconYahoo.gif diff --git a/src/main/java/com/google/gerrit/client/auth/openid/openidLogo.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/openidLogo.png similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/openid/openidLogo.png rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/openidLogo.png diff --git a/src/main/java/com/google/gerrit/client/auth/userpass/LoginConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/LoginConstants.java similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/userpass/LoginConstants.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/LoginConstants.java diff --git a/src/main/java/com/google/gerrit/client/auth/userpass/LoginConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/LoginConstants.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/userpass/LoginConstants.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/LoginConstants.properties diff --git a/src/main/java/com/google/gerrit/client/auth/userpass/LoginMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/LoginMessages.java similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/userpass/LoginMessages.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/LoginMessages.java diff --git a/src/main/java/com/google/gerrit/client/auth/userpass/LoginMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/LoginMessages.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/auth/userpass/LoginMessages.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/LoginMessages.properties diff --git a/src/main/java/com/google/gerrit/client/auth/userpass/UserPassSignInDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/UserPassSignInDialog.java similarity index 95% rename from src/main/java/com/google/gerrit/client/auth/userpass/UserPassSignInDialog.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/UserPassSignInDialog.java index 5c0fbc1429..a0ec038458 100644 --- a/src/main/java/com/google/gerrit/client/auth/userpass/UserPassSignInDialog.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/UserPassSignInDialog.java @@ -15,10 +15,12 @@ package com.google.gerrit.client.auth.userpass; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; import com.google.gerrit.client.SignInDialog; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.SmallHeading; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.auth.SignInMode; +import com.google.gerrit.common.auth.userpass.LoginResult; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.KeyCodes; @@ -50,7 +52,7 @@ public class UserPassSignInDialog extends SignInDialog { private TextBox password; public UserPassSignInDialog(final String initialErrorMsg) { - super(Mode.SIGN_IN); + super(SignInMode.SIGN_IN); formBody = new FlowPanel(); formBody.setStyleName("gerrit-OpenID-loginform"); @@ -194,8 +196,8 @@ public class UserPassSignInDialog extends SignInDialog { public void onSuccess(final LoginResult result) { if (result.success) { String token = History.getToken(); - if (result.isNew && !token.startsWith(Link.REGISTER + ",")) { - token = Link.REGISTER + "," + token; + if (result.isNew && !token.startsWith(PageLinks.REGISTER + ",")) { + token = PageLinks.REGISTER + "," + token; } // Unfortunately we no longer support updating the web UI when the diff --git a/src/main/java/com/google/gerrit/client/auth/userpass/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/Util.java similarity index 94% rename from src/main/java/com/google/gerrit/client/auth/userpass/Util.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/Util.java index 5e499794c5..738eacd57a 100644 --- a/src/main/java/com/google/gerrit/client/auth/userpass/Util.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/userpass/Util.java @@ -14,6 +14,7 @@ package com.google.gerrit.client.auth.userpass; +import com.google.gerrit.common.auth.userpass.UserPassAuthService; import com.google.gwt.core.client.GWT; import com.google.gwtjsonrpc.client.JsonUtil; diff --git a/src/main/java/com/google/gerrit/client/changes/AbandonChangeDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AbandonChangeDialog.java similarity index 97% rename from src/main/java/com/google/gerrit/client/changes/AbandonChangeDialog.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AbandonChangeDialog.java index a7082f1804..b046c22217 100644 --- a/src/main/java/com/google/gerrit/client/changes/AbandonChangeDialog.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AbandonChangeDialog.java @@ -14,10 +14,10 @@ package com.google.gerrit.client.changes; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.reviewdb.PatchSet; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.SmallHeading; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.DOM; diff --git a/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java similarity index 91% rename from src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java index e7298a54b8..7c3e3210a9 100644 --- a/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java @@ -15,13 +15,13 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.FormatUtil; -import com.google.gerrit.client.Link; import com.google.gerrit.client.changes.ChangeTable.ApprovalViewType; -import com.google.gerrit.client.data.AccountDashboardInfo; -import com.google.gerrit.client.data.AccountInfo; -import com.google.gerrit.client.reviewdb.Account; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.Screen; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.AccountDashboardInfo; +import com.google.gerrit.common.data.AccountInfo; +import com.google.gerrit.reviewdb.Account; public class AccountDashboardScreen extends Screen { @@ -48,7 +48,7 @@ public class AccountDashboardScreen extends Screen { table.addSection(forReview); table.addSection(closed); add(table); - table.setSavePointerId(Link.toAccountDashboard(ownerId)); + table.setSavePointerId(PageLinks.toAccountDashboard(ownerId)); } @Override diff --git a/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java similarity index 96% rename from src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java index a157f6d002..39b6162c8e 100644 --- a/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllAbandonedChangesScreen.java @@ -15,7 +15,7 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Change; public class AllAbandonedChangesScreen extends AllSingleListScreen { diff --git a/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java similarity index 96% rename from src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java index ae27542422..9c4931a35a 100644 --- a/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllMergedChangesScreen.java @@ -15,7 +15,7 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Change; public class AllMergedChangesScreen extends AllSingleListScreen { diff --git a/src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java similarity index 100% rename from src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllOpenChangesScreen.java diff --git a/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java similarity index 96% rename from src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java index 23a3b04243..8ec4f971ca 100644 --- a/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AllSingleListScreen.java @@ -15,11 +15,11 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.data.ChangeInfo; -import com.google.gerrit.client.data.SingleListChangeInfo; -import com.google.gerrit.client.reviewdb.AccountGeneralPreferences; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.Screen; +import com.google.gerrit.common.data.ChangeInfo; +import com.google.gerrit.common.data.SingleListChangeInfo; +import com.google.gerrit.reviewdb.AccountGeneralPreferences; import com.google.gwt.event.dom.client.KeyPressEvent; import com.google.gwt.user.client.History; import com.google.gwt.user.client.rpc.AsyncCallback; diff --git a/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java similarity index 94% rename from src/main/java/com/google/gerrit/client/changes/ApprovalTable.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java index 66221940a6..bbdb228141 100644 --- a/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java @@ -16,20 +16,20 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.ErrorDialog; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.data.ApprovalDetail; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.patches.AddReviewerResult; import com.google.gerrit.client.patches.PatchUtil; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSetApproval; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.AccountDashboardLink; import com.google.gerrit.client.ui.AddMemberBox; +import com.google.gerrit.common.data.AccountInfoCache; +import com.google.gerrit.common.data.AddReviewerResult; +import com.google.gerrit.common.data.ApprovalDetail; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSetApproval; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.DOM; diff --git a/src/main/java/com/google/gerrit/client/changes/ByProjectAbandonedChangesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ByProjectAbandonedChangesScreen.java similarity index 93% rename from src/main/java/com/google/gerrit/client/changes/ByProjectAbandonedChangesScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ByProjectAbandonedChangesScreen.java index c72beccea8..79d00ef9e7 100644 --- a/src/main/java/com/google/gerrit/client/changes/ByProjectAbandonedChangesScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ByProjectAbandonedChangesScreen.java @@ -14,8 +14,8 @@ package com.google.gerrit.client.changes; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Project; public class ByProjectAbandonedChangesScreen extends AllSingleListScreen { diff --git a/src/main/java/com/google/gerrit/client/changes/ByProjectMergedChangesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ByProjectMergedChangesScreen.java similarity index 93% rename from src/main/java/com/google/gerrit/client/changes/ByProjectMergedChangesScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ByProjectMergedChangesScreen.java index db8cb379dc..55caf90501 100644 --- a/src/main/java/com/google/gerrit/client/changes/ByProjectMergedChangesScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ByProjectMergedChangesScreen.java @@ -14,8 +14,8 @@ package com.google.gerrit.client.changes; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Project; public class ByProjectMergedChangesScreen extends AllSingleListScreen { diff --git a/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java similarity index 96% rename from src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java index b8679bac91..f9525a47c9 100644 --- a/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ByProjectOpenChangesScreen.java @@ -14,7 +14,7 @@ package com.google.gerrit.client.changes; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Project; public class ByProjectOpenChangesScreen extends AllSingleListScreen { diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java similarity index 100% rename from src/main/java/com/google/gerrit/client/changes/ChangeConstants.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java similarity index 92% rename from src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java index 6bc3fb7890..d3a943236d 100644 --- a/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeDescriptionBlock.java @@ -15,9 +15,9 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSetInfo; +import com.google.gerrit.common.data.AccountInfoCache; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSetInfo; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java similarity index 96% rename from src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java index a1d08cf85b..7a2cc640ab 100644 --- a/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java @@ -16,12 +16,12 @@ package com.google.gerrit.client.changes; import static com.google.gerrit.client.FormatUtil.mediumFormat; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Change; import com.google.gerrit.client.ui.AccountDashboardLink; import com.google.gerrit.client.ui.ChangeLink; import com.google.gerrit.client.ui.ProjectLink; +import com.google.gerrit.common.data.AccountInfoCache; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Change; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Grid; diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java similarity index 100% rename from src/main/java/com/google/gerrit/client/changes/ChangeMessages.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages_en.properties diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeQueryResultsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeQueryResultsScreen.java similarity index 90% rename from src/main/java/com/google/gerrit/client/changes/ChangeQueryResultsScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeQueryResultsScreen.java index b5359246e3..001a06f3dc 100644 --- a/src/main/java/com/google/gerrit/client/changes/ChangeQueryResultsScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeQueryResultsScreen.java @@ -15,10 +15,10 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.data.ChangeInfo; -import com.google.gerrit.client.data.SingleListChangeInfo; import com.google.gerrit.client.rpc.GerritCallback; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.ChangeInfo; +import com.google.gerrit.common.data.SingleListChangeInfo; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtorm.client.KeyUtil; @@ -47,7 +47,7 @@ public class ChangeQueryResultsScreen extends AllSingleListScreen { if (isAttached()) { if (result.getChanges().size() == 1) { final ChangeInfo c = result.getChanges().get(0); - Gerrit.display(Link.toChange(c), new ChangeScreen(c)); + Gerrit.display(PageLinks.toChange(c), new ChangeScreen(c)); } else { Gerrit.setQueryString(query); display(result); diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java similarity index 95% rename from src/main/java/com/google/gerrit/client/changes/ChangeScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java index e92ea1383c..e08f3302d1 100644 --- a/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java @@ -15,16 +15,6 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.data.AccountInfo; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.data.ChangeInfo; -import com.google.gerrit.client.data.GitwebLink; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeMessage; -import com.google.gerrit.client.reviewdb.PatchSet; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.CommentPanel; @@ -33,6 +23,17 @@ import com.google.gerrit.client.ui.ExpandAllCommand; import com.google.gerrit.client.ui.LinkMenuBar; import com.google.gerrit.client.ui.NeedsSignInKeyCommand; import com.google.gerrit.client.ui.Screen; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.AccountInfo; +import com.google.gerrit.common.data.AccountInfoCache; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.common.data.ChangeInfo; +import com.google.gerrit.common.data.GitwebLink; +import com.google.gerrit.common.data.ToggleStarRequest; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.KeyPressEvent; @@ -369,9 +370,9 @@ public class ChangeScreen extends Screen { @Override public void onKeyPress(final KeyPressEvent event) { if (Gerrit.isSignedIn()) { - Gerrit.display(Link.MINE, true); + Gerrit.display(PageLinks.MINE, true); } else { - Gerrit.display(Link.ALL_OPEN, true); + Gerrit.display(PageLinks.ALL_OPEN, true); } } } diff --git a/src/main/java/com/google/gerrit/client/changes/ChangeTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java similarity index 95% rename from src/main/java/com/google/gerrit/client/changes/ChangeTable.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java index 664f1ade39..57259d529f 100644 --- a/src/main/java/com/google/gerrit/client/changes/ChangeTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java @@ -18,25 +18,26 @@ import static com.google.gerrit.client.FormatUtil.shortFormat; import com.google.gerrit.client.FormatUtil; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.data.AccountInfo; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.data.ApprovalSummary; -import com.google.gerrit.client.data.ApprovalSummarySet; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ChangeInfo; import com.google.gerrit.client.patches.PatchUtil; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSetApproval; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.AccountDashboardLink; import com.google.gerrit.client.ui.ChangeLink; import com.google.gerrit.client.ui.NavigationTable; import com.google.gerrit.client.ui.NeedsSignInKeyCommand; import com.google.gerrit.client.ui.ProjectLink; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.AccountInfo; +import com.google.gerrit.common.data.AccountInfoCache; +import com.google.gerrit.common.data.ApprovalSummary; +import com.google.gerrit.common.data.ApprovalSummarySet; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ChangeInfo; +import com.google.gerrit.common.data.ToggleStarRequest; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSetApproval; import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -181,7 +182,7 @@ public class ChangeTable extends NavigationTable { @Override protected void onOpenRow(final int row) { final ChangeInfo c = getRowItem(row); - Gerrit.display(Link.toChange(c), new ChangeScreen(c)); + Gerrit.display(PageLinks.toChange(c), new ChangeScreen(c)); } private void insertNoneRow(final int row) { diff --git a/src/main/java/com/google/gerrit/client/changes/MessagePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MessagePanel.java similarity index 95% rename from src/main/java/com/google/gerrit/client/changes/MessagePanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MessagePanel.java index 4b3487e3d8..638cdec237 100644 --- a/src/main/java/com/google/gerrit/client/changes/MessagePanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MessagePanel.java @@ -15,7 +15,7 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.ChangeMessage; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder; diff --git a/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java similarity index 93% rename from src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java index a818d86f2e..2b935ba4b5 100644 --- a/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MineDraftsScreen.java @@ -15,12 +15,12 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; +import com.google.gerrit.common.PageLinks; public class MineDraftsScreen extends MineSingleListScreen { public MineDraftsScreen() { - super(Link.MINE_DRAFTS); + super(PageLinks.MINE_DRAFTS); } @Override diff --git a/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java similarity index 96% rename from src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java index 09e550148f..9016b21fdc 100644 --- a/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MineSingleListScreen.java @@ -14,9 +14,9 @@ package com.google.gerrit.client.changes; -import com.google.gerrit.client.data.SingleListChangeInfo; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.AccountScreen; +import com.google.gerrit.common.data.SingleListChangeInfo; import com.google.gwt.user.client.rpc.AsyncCallback; diff --git a/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java similarity index 93% rename from src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java index c462f66af0..df4d30d40a 100644 --- a/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java @@ -15,12 +15,12 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; +import com.google.gerrit.common.PageLinks; public class MineStarredScreen extends MineSingleListScreen { public MineStarredScreen() { - super(Link.MINE_STARRED); + super(PageLinks.MINE_STARRED); } @Override diff --git a/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java similarity index 94% rename from src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java index a1b65e55b0..ab2b84615a 100644 --- a/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java @@ -16,19 +16,19 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.FormatUtil; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.data.PatchSetDetail; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeMessage; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetInfo; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.UserIdentity; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.AccountDashboardLink; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.common.data.PatchSetDetail; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetInfo; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.UserIdentity; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.OpenEvent; @@ -164,7 +164,7 @@ class PatchSetPanel extends Composite implements OpenHandler { r.append("git pull ssh://"); r.append(Gerrit.getUserAccount().getSshUserName()); r.append("@"); - if (sshAddr.startsWith(":") || "".equals(sshAddr)) { + if (sshAddr.startsWith("*:") || "".equals(sshAddr)) { r.append(Window.Location.getHostName()); } r.append(sshAddr); diff --git a/src/main/java/com/google/gerrit/client/changes/PatchTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchTable.java similarity index 99% rename from src/main/java/com/google/gerrit/client/changes/PatchTable.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchTable.java index 9e0e3d3aa1..cbb29cdb66 100644 --- a/src/main/java/com/google/gerrit/client/changes/PatchTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchTable.java @@ -16,12 +16,12 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.patches.PatchScreen; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.Patch.Key; import com.google.gerrit.client.ui.DirectScreenLink; import com.google.gerrit.client.ui.NavigationTable; import com.google.gerrit.client.ui.PatchLink; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Patch.Key; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; diff --git a/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java similarity index 94% rename from src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java index bac997a612..73e6d1e81b 100644 --- a/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java @@ -15,22 +15,23 @@ package com.google.gerrit.client.changes; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.data.ApprovalType; import com.google.gerrit.client.patches.CommentEditorPanel; import com.google.gerrit.client.patches.PatchUtil; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.rpc.ScreenLoadCallback; import com.google.gerrit.client.ui.AccountScreen; import com.google.gerrit.client.ui.PatchLink; import com.google.gerrit.client.ui.SmallHeading; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.PatchSetPublishDetail; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.DOM; @@ -294,7 +295,7 @@ public class PublishCommentScreen extends AccountScreen implements ClickHandler private void goChange() { final Change.Id ck = patchSetId.getParentKey(); - Gerrit.display(Link.toChange(ck), new ChangeScreen(ck)); + Gerrit.display(PageLinks.toChange(ck), new ChangeScreen(ck)); } private static class ValueRadioButton extends RadioButton { diff --git a/src/main/java/com/google/gerrit/client/changes/SubmitFailureDialog.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/SubmitFailureDialog.java similarity index 94% rename from src/main/java/com/google/gerrit/client/changes/SubmitFailureDialog.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/SubmitFailureDialog.java index e331550f64..99a7db27a6 100644 --- a/src/main/java/com/google/gerrit/client/changes/SubmitFailureDialog.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/SubmitFailureDialog.java @@ -14,8 +14,8 @@ package com.google.gerrit.client.changes; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.reviewdb.ChangeMessage; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.reviewdb.ChangeMessage; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Button; diff --git a/src/main/java/com/google/gerrit/client/changes/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java similarity index 89% rename from src/main/java/com/google/gerrit/client/changes/Util.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java index 9461edb4f7..0ae020aff8 100644 --- a/src/main/java/com/google/gerrit/client/changes/Util.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java @@ -14,7 +14,10 @@ package com.google.gerrit.client.changes; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.common.data.ChangeDetailService; +import com.google.gerrit.common.data.ChangeListService; +import com.google.gerrit.common.data.ChangeManageService; +import com.google.gerrit.reviewdb.Change; import com.google.gwt.core.client.GWT; import com.google.gwtjsonrpc.client.JsonUtil; diff --git a/src/main/java/com/google/gerrit/client/greenCheck.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/greenCheck.png similarity index 100% rename from src/main/java/com/google/gerrit/client/greenCheck.png rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/greenCheck.png diff --git a/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java similarity index 97% rename from src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java index 0776b5e0aa..b40c775e27 100644 --- a/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java @@ -18,16 +18,17 @@ import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.changes.PatchTable; import com.google.gerrit.client.changes.PublishCommentScreen; import com.google.gerrit.client.changes.Util; -import com.google.gerrit.client.data.AccountInfo; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.data.PatchScript; -import com.google.gerrit.client.data.SparseFileContent; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; import com.google.gerrit.client.ui.CommentPanel; import com.google.gerrit.client.ui.NavigationTable; import com.google.gerrit.client.ui.NeedsSignInKeyCommand; +import com.google.gerrit.common.data.AccountInfo; +import com.google.gerrit.common.data.AccountInfoCache; +import com.google.gerrit.common.data.CommentDetail; +import com.google.gerrit.common.data.PatchScript; +import com.google.gerrit.common.data.SparseFileContent; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.KeyCodes; diff --git a/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java similarity index 99% rename from src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java index 8353c0e235..92b895fbff 100644 --- a/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java @@ -14,9 +14,9 @@ package com.google.gerrit.client.patches; -import com.google.gerrit.client.reviewdb.PatchLineComment; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.CommentPanel; +import com.google.gerrit.reviewdb.PatchLineComment; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.DoubleClickEvent; diff --git a/src/main/java/com/google/gerrit/client/patches/HistoryTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/HistoryTable.java similarity index 98% rename from src/main/java/com/google/gerrit/client/patches/HistoryTable.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/HistoryTable.java index 05059a3cad..bd7336709e 100644 --- a/src/main/java/com/google/gerrit/client/patches/HistoryTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/HistoryTable.java @@ -15,9 +15,9 @@ package com.google.gerrit.client.patches; import com.google.gerrit.client.changes.Util; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchSet; import com.google.gerrit.client.ui.FancyFlexTable; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.HasHorizontalAlignment; diff --git a/src/main/java/com/google/gerrit/client/patches/PatchBrowserPopup.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchBrowserPopup.java similarity index 98% rename from src/main/java/com/google/gerrit/client/patches/PatchBrowserPopup.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchBrowserPopup.java index 8768fb74f5..bc7922a690 100644 --- a/src/main/java/com/google/gerrit/client/patches/PatchBrowserPopup.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchBrowserPopup.java @@ -16,7 +16,7 @@ package com.google.gerrit.client.patches; import com.google.gerrit.client.changes.PatchTable; import com.google.gerrit.client.changes.Util; -import com.google.gerrit.client.reviewdb.Patch; +import com.google.gerrit.reviewdb.Patch; import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; import com.google.gwt.event.shared.HandlerRegistration; diff --git a/src/main/java/com/google/gerrit/client/patches/PatchConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java similarity index 100% rename from src/main/java/com/google/gerrit/client/patches/PatchConstants.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java diff --git a/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/patches/PatchConstants.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties diff --git a/src/main/java/com/google/gerrit/client/patches/PatchLine.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchLine.java similarity index 100% rename from src/main/java/com/google/gerrit/client/patches/PatchLine.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchLine.java diff --git a/src/main/java/com/google/gerrit/client/patches/PatchMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.java similarity index 100% rename from src/main/java/com/google/gerrit/client/patches/PatchMessages.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.java diff --git a/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/patches/PatchMessages.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties diff --git a/src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchMessages_en.properties diff --git a/src/main/java/com/google/gerrit/client/patches/PatchScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScreen.java similarity index 95% rename from src/main/java/com/google/gerrit/client/patches/PatchScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScreen.java index 22b329a3ac..cb65a9386f 100644 --- a/src/main/java/com/google/gerrit/client/patches/PatchScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScreen.java @@ -14,26 +14,28 @@ package com.google.gerrit.client.patches; -import static com.google.gerrit.client.reviewdb.AccountGeneralPreferences.DEFAULT_CONTEXT; -import static com.google.gerrit.client.reviewdb.AccountGeneralPreferences.WHOLE_FILE_CONTEXT; +import static com.google.gerrit.reviewdb.AccountGeneralPreferences.DEFAULT_CONTEXT; +import static com.google.gerrit.reviewdb.AccountGeneralPreferences.WHOLE_FILE_CONTEXT; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; +import com.google.gerrit.client.HistoryHandler; import com.google.gerrit.client.changes.ChangeScreen; import com.google.gerrit.client.changes.PatchTable; import com.google.gerrit.client.changes.Util; -import com.google.gerrit.client.data.PatchScript; -import com.google.gerrit.client.data.PatchScriptSettings; -import com.google.gerrit.client.data.PatchSetDetail; -import com.google.gerrit.client.data.PatchScriptSettings.Whitespace; -import com.google.gerrit.client.reviewdb.AccountGeneralPreferences; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchSet; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.ChangeLink; import com.google.gerrit.client.ui.DirectScreenLink; import com.google.gerrit.client.ui.Screen; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.CommentDetail; +import com.google.gerrit.common.data.PatchScript; +import com.google.gerrit.common.data.PatchScriptSettings; +import com.google.gerrit.common.data.PatchSetDetail; +import com.google.gerrit.common.data.PatchScriptSettings.Whitespace; +import com.google.gerrit.reviewdb.AccountGeneralPreferences; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.KeyPressEvent; @@ -481,7 +483,7 @@ public abstract class PatchScreen extends Screen { contentTable = new UnifiedDiffTable(); contentTable.fileList = fileList; contentPanel.add(contentTable); - History.newItem(Link.toPatchUnified(patchKey), false); + History.newItem(HistoryHandler.toPatchUnified(patchKey), false); } if (hasDifferences) { @@ -524,7 +526,7 @@ public abstract class PatchScreen extends Screen { @Override public void onKeyPress(final KeyPressEvent event) { final Change.Id ck = patchKey.getParentKey().getParentKey(); - Gerrit.display(Link.toChange(ck), new ChangeScreen(ck)); + Gerrit.display(PageLinks.toChange(ck), new ChangeScreen(ck)); } } diff --git a/src/main/java/com/google/gerrit/client/patches/PatchUtil.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchUtil.java similarity index 95% rename from src/main/java/com/google/gerrit/client/patches/PatchUtil.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchUtil.java index aba87965f0..709685f795 100644 --- a/src/main/java/com/google/gerrit/client/patches/PatchUtil.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchUtil.java @@ -14,6 +14,7 @@ package com.google.gerrit.client.patches; +import com.google.gerrit.common.data.PatchDetailService; import com.google.gwt.core.client.GWT; import com.google.gwtjsonrpc.client.JsonUtil; diff --git a/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java similarity index 97% rename from src/main/java/com/google/gerrit/client/patches/SideBySideTable.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java index 722772f3cf..3c641ff8a3 100644 --- a/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java @@ -19,10 +19,11 @@ import static com.google.gerrit.client.patches.PatchLine.Type.DELETE; import static com.google.gerrit.client.patches.PatchLine.Type.INSERT; import static com.google.gerrit.client.patches.PatchLine.Type.REPLACE; -import com.google.gerrit.client.data.EditList; -import com.google.gerrit.client.data.PatchScript; -import com.google.gerrit.client.data.SparseFileContent; -import com.google.gerrit.client.reviewdb.PatchLineComment; +import com.google.gerrit.common.data.CommentDetail; +import com.google.gerrit.common.data.EditList; +import com.google.gerrit.common.data.PatchScript; +import com.google.gerrit.common.data.SparseFileContent; +import com.google.gerrit.reviewdb.PatchLineComment; import com.google.gwt.user.client.ui.HTMLTable.CellFormatter; import com.google.gwtexpui.safehtml.client.PrettyFormatter; import com.google.gwtexpui.safehtml.client.SafeHtml; diff --git a/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java similarity index 96% rename from src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java index 19c0bd1904..7e6805233b 100644 --- a/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java @@ -18,13 +18,14 @@ import static com.google.gerrit.client.patches.PatchLine.Type.CONTEXT; import static com.google.gerrit.client.patches.PatchLine.Type.DELETE; import static com.google.gerrit.client.patches.PatchLine.Type.INSERT; -import com.google.gerrit.client.data.EditList; -import com.google.gerrit.client.data.PatchScript; -import com.google.gerrit.client.data.SparseFileContent; -import com.google.gerrit.client.data.EditList.Hunk; -import com.google.gerrit.client.data.PatchScript.DisplayMethod; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; +import com.google.gerrit.common.data.CommentDetail; +import com.google.gerrit.common.data.EditList; +import com.google.gerrit.common.data.PatchScript; +import com.google.gerrit.common.data.SparseFileContent; +import com.google.gerrit.common.data.EditList.Hunk; +import com.google.gerrit.common.data.PatchScript.DisplayMethod; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.HTMLTable.CellFormatter; import com.google.gwtexpui.safehtml.client.PrettyFormatter; diff --git a/src/main/java/com/google/gerrit/client/redNot.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/redNot.png similarity index 100% rename from src/main/java/com/google/gerrit/client/redNot.png rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/redNot.png diff --git a/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java similarity index 92% rename from src/main/java/com/google/gerrit/client/rpc/GerritCallback.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java index dd69d517b0..fa028d75ba 100644 --- a/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java @@ -17,6 +17,10 @@ package com.google.gerrit.client.rpc; import com.google.gerrit.client.ErrorDialog; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.NotSignedInDialog; +import com.google.gerrit.common.errors.NameAlreadyUsedException; +import com.google.gerrit.common.errors.NoSuchAccountException; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.common.errors.NotSignedInException; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.rpc.InvocationException; diff --git a/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java similarity index 100% rename from src/main/java/com/google/gerrit/client/rpc/RpcConstants.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java diff --git a/src/main/java/com/google/gerrit/client/rpc/RpcConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RpcConstants.properties similarity index 100% rename from src/main/java/com/google/gerrit/client/rpc/RpcConstants.properties rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RpcConstants.properties diff --git a/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java similarity index 95% rename from src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java index e5f36af159..bfd30f71b1 100644 --- a/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java @@ -17,6 +17,7 @@ package com.google.gerrit.client.rpc; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.NotFoundScreen; import com.google.gerrit.client.ui.Screen; +import com.google.gerrit.common.errors.NoSuchEntityException; /** Callback switching {@link NoSuchEntityException} to {@link NotFoundScreen} */ public abstract class ScreenLoadCallback extends GerritCallback { diff --git a/src/main/java/com/google/gerrit/client/starFilled.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/starFilled.gif similarity index 100% rename from src/main/java/com/google/gerrit/client/starFilled.gif rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/starFilled.gif diff --git a/src/main/java/com/google/gerrit/client/starOpen.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/starOpen.gif similarity index 100% rename from src/main/java/com/google/gerrit/client/starOpen.gif rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/starOpen.gif diff --git a/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java similarity index 87% rename from src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java index 162be008be..a9ddfbc85b 100644 --- a/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java @@ -15,11 +15,11 @@ package com.google.gerrit.client.ui; import com.google.gerrit.client.FormatUtil; -import com.google.gerrit.client.Link; import com.google.gerrit.client.changes.AccountDashboardScreen; -import com.google.gerrit.client.data.AccountInfo; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.AccountInfo; +import com.google.gerrit.common.data.AccountInfoCache; +import com.google.gerrit.reviewdb.Account; /** Link to any user's account dashboard. */ public class AccountDashboardLink extends DirectScreenLink { @@ -42,7 +42,7 @@ public class AccountDashboardLink extends DirectScreenLink { } public AccountDashboardLink(final String text, final Account.Id ai) { - super(text, Link.toAccountDashboard(ai)); + super(text, PageLinks.toAccountDashboard(ai)); addStyleName("gerrit-AccountName"); accountId = ai; } diff --git a/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java similarity index 97% rename from src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java index e0a497a9be..41da6c3969 100644 --- a/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountGroupSuggestOracle.java @@ -15,8 +15,8 @@ package com.google.gerrit.client.ui; import com.google.gerrit.client.RpcStatus; -import com.google.gerrit.client.reviewdb.AccountGroup; import com.google.gerrit.client.rpc.GerritCallback; +import com.google.gerrit.reviewdb.AccountGroup; import com.google.gwt.user.client.ui.SuggestOracle; import com.google.gwtexpui.safehtml.client.HighlightSuggestOracle; diff --git a/src/main/java/com/google/gerrit/client/ui/AccountScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountScreen.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/AccountScreen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountScreen.java diff --git a/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java similarity index 97% rename from src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java index 51da314f37..441878f41a 100644 --- a/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountSuggestOracle.java @@ -16,8 +16,8 @@ package com.google.gerrit.client.ui; import com.google.gerrit.client.FormatUtil; import com.google.gerrit.client.RpcStatus; -import com.google.gerrit.client.data.AccountInfo; import com.google.gerrit.client.rpc.GerritCallback; +import com.google.gerrit.common.data.AccountInfo; import com.google.gwt.user.client.ui.SuggestOracle; import com.google.gwtexpui.safehtml.client.HighlightSuggestOracle; diff --git a/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/AddMemberBox.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AddMemberBox.java diff --git a/src/main/java/com/google/gerrit/client/ui/ChangeLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java similarity index 88% rename from src/main/java/com/google/gerrit/client/ui/ChangeLink.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java index 925377e4de..1e8efe1cce 100644 --- a/src/main/java/com/google/gerrit/client/ui/ChangeLink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ChangeLink.java @@ -14,10 +14,10 @@ package com.google.gerrit.client.ui; -import com.google.gerrit.client.Link; import com.google.gerrit.client.changes.ChangeScreen; -import com.google.gerrit.client.data.ChangeInfo; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.ChangeInfo; +import com.google.gerrit.reviewdb.Change; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.DOM; @@ -30,7 +30,7 @@ public class ChangeLink extends DirectScreenLink { private ChangeInfo info; public ChangeLink(final String text, final Change.Id c) { - super(text, Link.toChange(c)); + super(text, PageLinks.toChange(c)); DOM.setElementProperty(getElement(), "href", permalink(c)); id = c; } diff --git a/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommandMenuItem.java diff --git a/src/main/java/com/google/gerrit/client/ui/CommentPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentPanel.java similarity index 99% rename from src/main/java/com/google/gerrit/client/ui/CommentPanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentPanel.java index d7ea85fbac..eec83768e1 100644 --- a/src/main/java/com/google/gerrit/client/ui/CommentPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CommentPanel.java @@ -16,7 +16,7 @@ package com.google.gerrit.client.ui; import com.google.gerrit.client.FormatUtil; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.data.AccountInfo; +import com.google.gerrit.common.data.AccountInfo; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.DoubleClickEvent; diff --git a/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java diff --git a/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java diff --git a/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java diff --git a/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java diff --git a/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImpl.java diff --git a/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java diff --git a/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java diff --git a/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java diff --git a/src/main/java/com/google/gerrit/client/ui/NavigationTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/NavigationTable.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NavigationTable.java diff --git a/src/main/java/com/google/gerrit/client/ui/NeedsSignInKeyCommand.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NeedsSignInKeyCommand.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/NeedsSignInKeyCommand.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/NeedsSignInKeyCommand.java diff --git a/src/main/java/com/google/gerrit/client/ui/PatchLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/PatchLink.java similarity index 87% rename from src/main/java/com/google/gerrit/client/ui/PatchLink.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/PatchLink.java index 9273f26102..baa1d1121a 100644 --- a/src/main/java/com/google/gerrit/client/ui/PatchLink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/PatchLink.java @@ -14,10 +14,10 @@ package com.google.gerrit.client.ui; -import com.google.gerrit.client.Link; +import com.google.gerrit.client.HistoryHandler; import com.google.gerrit.client.changes.PatchTable; import com.google.gerrit.client.patches.PatchScreen; -import com.google.gerrit.client.reviewdb.Patch; +import com.google.gerrit.reviewdb.Patch; public abstract class PatchLink extends DirectScreenLink { protected Patch.Key patchKey; @@ -42,7 +42,7 @@ public abstract class PatchLink extends DirectScreenLink { public static class SideBySide extends PatchLink { public SideBySide(final String text, final Patch.Key patchKey, final int patchIndex, PatchTable parentPatchTable) { - super(text, patchKey, patchIndex, Link.toPatchSideBySide(patchKey), parentPatchTable); + super(text, patchKey, patchIndex, HistoryHandler.toPatchSideBySide(patchKey), parentPatchTable); } @Override @@ -54,7 +54,7 @@ public abstract class PatchLink extends DirectScreenLink { public static class Unified extends PatchLink { public Unified(final String text, final Patch.Key patchKey, final int patchIndex, PatchTable parentPatchTable) { - super(text, patchKey, patchIndex, Link.toPatchUnified(patchKey), parentPatchTable); + super(text, patchKey, patchIndex, HistoryHandler.toPatchUnified(patchKey), parentPatchTable); } @Override diff --git a/src/main/java/com/google/gerrit/client/ui/ProjectLink.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectLink.java similarity index 87% rename from src/main/java/com/google/gerrit/client/ui/ProjectLink.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectLink.java index d743c5f65f..c5b37ae741 100644 --- a/src/main/java/com/google/gerrit/client/ui/ProjectLink.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectLink.java @@ -14,13 +14,13 @@ package com.google.gerrit.client.ui; -import com.google.gerrit.client.Link; +import com.google.gerrit.client.HistoryHandler; import com.google.gerrit.client.changes.ByProjectAbandonedChangesScreen; import com.google.gerrit.client.changes.ByProjectMergedChangesScreen; import com.google.gerrit.client.changes.ByProjectOpenChangesScreen; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.Change.Status; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.Change.Status; /** Link to the open changes of a project. */ public class ProjectLink extends DirectScreenLink { @@ -33,7 +33,7 @@ public class ProjectLink extends DirectScreenLink { public ProjectLink(final String text, final Project.NameKey proj, Change.Status stat) { - super(text, Link.toProject(proj, stat)); + super(text, HistoryHandler.toProject(proj, stat)); status = stat; project = proj; } diff --git a/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java similarity index 97% rename from src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java index 86195490aa..49fe165647 100644 --- a/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectNameSuggestOracle.java @@ -15,8 +15,8 @@ package com.google.gerrit.client.ui; import com.google.gerrit.client.RpcStatus; -import com.google.gerrit.client.reviewdb.Project; import com.google.gerrit.client.rpc.GerritCallback; +import com.google.gerrit.reviewdb.Project; import com.google.gwt.user.client.ui.SuggestOracle; import com.google.gwtexpui.safehtml.client.HighlightSuggestOracle; diff --git a/src/main/java/com/google/gerrit/client/ui/Screen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java similarity index 96% rename from src/main/java/com/google/gerrit/client/ui/Screen.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java index e6f8372a20..2cffcc0b0f 100644 --- a/src/main/java/com/google/gerrit/client/ui/Screen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/Screen.java @@ -15,7 +15,7 @@ package com.google.gerrit.client.ui; import com.google.gerrit.client.Gerrit; -import com.google.gerrit.client.Link; +import com.google.gerrit.common.PageLinks; import com.google.gwt.user.client.History; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.InlineLabel; @@ -88,7 +88,7 @@ public abstract class Screen extends View { /** Invoked if this screen is the current screen and the user signs out. */ public void onSignOut() { if (isRequiresSignIn()) { - History.newItem(Link.ALL_OPEN); + History.newItem(PageLinks.ALL_OPEN); } } diff --git a/src/main/java/com/google/gerrit/client/ui/SmallHeading.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SmallHeading.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/SmallHeading.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SmallHeading.java diff --git a/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java similarity index 94% rename from src/main/java/com/google/gerrit/client/ui/SuggestUtil.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java index 81d11c4f83..6e81b71b0c 100644 --- a/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/SuggestUtil.java @@ -14,6 +14,7 @@ package com.google.gerrit.client.ui; +import com.google.gerrit.common.data.SuggestService; import com.google.gwt.core.client.GWT; import com.google.gwtjsonrpc.client.JsonUtil; diff --git a/src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java similarity index 100% rename from src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/TextSaveButtonListener.java diff --git a/src/main/java/com/google/gerrit/client/GerritVersion.java b/gerrit-gwtui/src/main/java/com/google/gerrit/common/Version.java similarity index 90% rename from src/main/java/com/google/gerrit/client/GerritVersion.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/common/Version.java index f49dfd313d..d831c7158e 100644 --- a/src/main/java/com/google/gerrit/client/GerritVersion.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/common/Version.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client; +package com.google.gerrit.common; import com.google.gwt.i18n.client.Constants; @@ -21,6 +21,6 @@ import com.google.gwt.i18n.client.Constants; *

* Do not translate this constants interface. */ -public interface GerritVersion extends Constants { +public interface Version extends Constants { String version(); } diff --git a/src/main/java/com/google/gerrit/public/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/public/gerrit.css similarity index 100% rename from src/main/java/com/google/gerrit/public/gerrit.css rename to gerrit-gwtui/src/main/java/com/google/gerrit/public/gerrit.css diff --git a/src/main/java/com/google/gerrit/public/openidlogin_bg1.cache.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/public/openidlogin_bg1.cache.gif similarity index 100% rename from src/main/java/com/google/gerrit/public/openidlogin_bg1.cache.gif rename to gerrit-gwtui/src/main/java/com/google/gerrit/public/openidlogin_bg1.cache.gif diff --git a/gerrit-gwtui/src/main/webapp/WEB-INF/web.xml b/gerrit-gwtui/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..494f0c1623 --- /dev/null +++ b/gerrit-gwtui/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,3 @@ + + + diff --git a/gerrit-httpd/.gitignore b/gerrit-httpd/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-httpd/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-httpd/.settings/org.eclipse.core.resources.prefs b/gerrit-httpd/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-httpd/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-httpd/.settings/org.eclipse.core.runtime.prefs b/gerrit-httpd/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-httpd/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-httpd/.settings/org.eclipse.jdt.core.prefs b/gerrit-httpd/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-httpd/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-httpd/.settings/org.eclipse.jdt.ui.prefs b/gerrit-httpd/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-httpd/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-httpd/pom.xml b/gerrit-httpd/pom.xml new file mode 100644 index 0000000000..acda03c7a5 --- /dev/null +++ b/gerrit-httpd/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-httpd + Gerrit Code Review - HTTPd + + + Servlet context for components run inside of an HTTP environment. + + + + + javax.servlet + servlet-api + provided + + + + com.google.gwt + gwt-servlet + + + + eu.medsea.mimeutil + mime-util + + + + org.openid4java + openid4java-consumer + + + + gwtjsonrpc + gwtjsonrpc + + + + com.google.gerrit + gerrit-server + + + diff --git a/src/main/java/com/google/gerrit/server/http/CookieBase64.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java similarity index 98% rename from src/main/java/com/google/gerrit/server/http/CookieBase64.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java index f0092d3ac7..3bcdcd25e8 100644 --- a/src/main/java/com/google/gerrit/server/http/CookieBase64.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CookieBase64.java @@ -16,7 +16,7 @@ // public domain Base64 class, version 2.1. // -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; /** Base64 encoder which uses a language safe within HTTP cookies. */ class CookieBase64 { diff --git a/src/main/java/com/google/gerrit/server/http/GerritConfigProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java similarity index 89% rename from src/main/java/com/google/gerrit/server/http/GerritConfigProvider.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java index 0ee04d5e85..a56addd3eb 100644 --- a/src/main/java/com/google/gerrit/server/http/GerritConfigProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.data.GerritConfig; -import com.google.gerrit.client.data.GitwebLink; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.GerritConfig; +import com.google.gerrit.common.data.GitwebLink; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.Project; import com.google.gerrit.server.account.Realm; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.CanonicalWebUrl; @@ -38,7 +38,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; -public class GerritConfigProvider implements Provider { +class GerritConfigProvider implements Provider { private final Realm realm; private final Config cfg; private final String canonicalWebUrl; @@ -99,7 +99,9 @@ public class GerritConfigProvider implements Provider { config.setGitwebLink(new GitwebLink(gitwebUrl)); } - config.setSshdAddress(sshInfo != null ? sshInfo.getSshdAddress() : null); + if (sshInfo != null && !sshInfo.getHostKeys().isEmpty()) { + config.setSshdAddress(sshInfo.getHostKeys().get(0).getHost()); + } ArrayList commentLinkNames = new ArrayList(cfg.getSubsections("CommentLink")); diff --git a/src/main/java/com/google/gerrit/server/http/HtmlDomUtil.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HtmlDomUtil.java similarity index 94% rename from src/main/java/com/google/gerrit/server/http/HtmlDomUtil.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/HtmlDomUtil.java index fddc4ea505..a675e4f917 100644 --- a/src/main/java/com/google/gerrit/server/http/HtmlDomUtil.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HtmlDomUtil.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -31,7 +31,6 @@ import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.util.zip.GZIPOutputStream; -import javax.servlet.ServletContext; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -135,9 +134,9 @@ public class HtmlDomUtil { return d; } - /** Parse an XHTML file from our ServletContext and return the instance. */ - public static Document parseFile(final ServletContext context, - final String name) throws IOException { + /** Parse an XHTML file from our CLASSPATH and return the instance. */ + public static Document parseFile(final Class context, final String name) + throws IOException { final InputStream in; in = context.getResourceAsStream(name); @@ -161,8 +160,8 @@ public class HtmlDomUtil { } } - /** Read a Read a UTF-8 text file from our ServletContext and return it. */ - public static String readFile(final ServletContext context, final String name) + /** Read a Read a UTF-8 text file from our CLASSPATH and return it. */ + public static String readFile(final Class context, final String name) throws IOException { final InputStream in = context.getResourceAsStream(name); if (in == null) { diff --git a/src/main/java/com/google/gerrit/server/http/HttpCanonicalWebUrlProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpCanonicalWebUrlProvider.java similarity index 98% rename from src/main/java/com/google/gerrit/server/http/HttpCanonicalWebUrlProvider.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpCanonicalWebUrlProvider.java index 013da83c49..a28abfe485 100644 --- a/src/main/java/com/google/gerrit/server/http/HttpCanonicalWebUrlProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpCanonicalWebUrlProvider.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.CanonicalWebUrlProvider; diff --git a/src/main/java/com/google/gerrit/server/http/HttpCurrentUserProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpCurrentUserProvider.java similarity index 96% rename from src/main/java/com/google/gerrit/server/http/HttpCurrentUserProvider.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpCurrentUserProvider.java index 859105e8b3..04de4087e2 100644 --- a/src/main/java/com/google/gerrit/server/http/HttpCurrentUserProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpCurrentUserProvider.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import com.google.gerrit.server.CurrentUser; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/http/HttpIdentifiedUserProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpIdentifiedUserProvider.java similarity index 93% rename from src/main/java/com/google/gerrit/server/http/HttpIdentifiedUserProvider.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpIdentifiedUserProvider.java index 9961acca1f..d611098fe1 100644 --- a/src/main/java/com/google/gerrit/server/http/HttpIdentifiedUserProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpIdentifiedUserProvider.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; -import com.google.gerrit.client.rpc.NotSignedInException; +import com.google.gerrit.common.errors.NotSignedInException; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/http/HttpLogoutServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java similarity index 97% rename from src/main/java/com/google/gerrit/server/http/HttpLogoutServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java index f399d55c9c..13b8293901 100644 --- a/src/main/java/com/google/gerrit/server/http/HttpLogoutServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import com.google.gerrit.server.account.AccountManager; import com.google.gerrit.server.config.AuthConfig; diff --git a/src/main/java/com/google/gerrit/server/http/HttpRemotePeerProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java similarity index 97% rename from src/main/java/com/google/gerrit/server/http/HttpRemotePeerProvider.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java index a8ce141019..9e0b0421e4 100644 --- a/src/main/java/com/google/gerrit/server/http/HttpRemotePeerProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/src/main/java/com/google/gerrit/server/http/RequestCleanupFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestCleanupFilter.java similarity index 97% rename from src/main/java/com/google/gerrit/server/http/RequestCleanupFilter.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestCleanupFilter.java index d3e28d042f..0e6a567598 100644 --- a/src/main/java/com/google/gerrit/server/http/RequestCleanupFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestCleanupFilter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import com.google.gerrit.server.RequestCleanup; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/http/UrlModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java similarity index 73% rename from src/main/java/com/google/gerrit/server/http/UrlModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java index 7be9708e72..bb4e7d4b0c 100644 --- a/src/main/java/com/google/gerrit/server/http/UrlModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java @@ -12,12 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import static com.google.inject.Scopes.SINGLETON; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.reviewdb.RevId; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.httpd.raw.CatServlet; +import com.google.gerrit.httpd.raw.HostPageServlet; +import com.google.gerrit.httpd.raw.LegacyGerritServlet; +import com.google.gerrit.httpd.raw.PrettifyServlet; +import com.google.gerrit.httpd.raw.SshInfoServlet; +import com.google.gerrit.httpd.raw.StaticServlet; +import com.google.gerrit.reviewdb.RevId; import com.google.gwtexpui.server.CacheControlFilter; import com.google.inject.Key; import com.google.inject.Provider; @@ -43,14 +49,17 @@ class UrlModule extends ServletModule { serve("/logout").with(HttpLogoutServlet.class); serve("/prettify/*").with(PrettifyServlet.class); serve("/signout").with(HttpLogoutServlet.class); - serve("/ssh_info").with(SshServlet.class); + serve("/ssh_info").with(SshInfoServlet.class); serve("/static/*").with(StaticServlet.class); - serve("/all").with(screen(Link.ALL_MERGED)); - serve("/mine").with(screen(Link.MINE)); - serve("/open").with(screen(Link.ALL_OPEN)); - serve("/settings").with(screen(Link.SETTINGS)); - serve("/starred").with(screen(Link.MINE_STARRED)); + serve("/Main.class").with(notFound()); + serve("/com/google/gerrit/main/*").with(notFound()); + + serve("/all").with(screen(PageLinks.ALL_MERGED)); + serve("/mine").with(screen(PageLinks.MINE)); + serve("/open").with(screen(PageLinks.ALL_OPEN)); + serve("/settings").with(screen(PageLinks.SETTINGS)); + serve("/starred").with(screen(PageLinks.MINE_STARRED)); serveRegex( // "^/([1-9][0-9]*)/?$", // @@ -58,6 +67,16 @@ class UrlModule extends ServletModule { ).with(changeQuery()); } + private Key notFound() { + return key(new HttpServlet() { + @Override + protected void doGet(final HttpServletRequest req, + final HttpServletResponse rsp) throws IOException { + rsp.sendError(HttpServletResponse.SC_NOT_FOUND); + } + }); + } + private Key screen(final String target) { return key(new HttpServlet() { @Override @@ -84,7 +103,7 @@ class UrlModule extends ServletModule { @Override protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp) throws IOException { - toGerrit(Link.toChangeQuery(req.getPathInfo()), req, rsp); + toGerrit(PageLinks.toChangeQuery(req.getPathInfo()), req, rsp); } }); } diff --git a/src/main/java/com/google/gerrit/server/http/WebModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java similarity index 76% rename from src/main/java/com/google/gerrit/server/http/WebModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java index b0cd1569cd..f11d35c3ae 100644 --- a/src/main/java/com/google/gerrit/server/http/WebModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java @@ -12,12 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import static com.google.inject.Scopes.SINGLETON; -import com.google.gerrit.client.data.GerritConfig; -import com.google.gerrit.client.reviewdb.AuthType; +import com.google.gerrit.common.data.GerritConfig; +import com.google.gerrit.httpd.auth.become.BecomeAnyAccountLoginServlet; +import com.google.gerrit.httpd.auth.container.HttpAuthModule; +import com.google.gerrit.httpd.auth.ldap.LdapAuthModule; +import com.google.gerrit.httpd.auth.openid.OpenIdModule; +import com.google.gerrit.httpd.rpc.UiRpcModule; +import com.google.gerrit.reviewdb.AuthType; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.RemotePeer; @@ -27,10 +32,8 @@ import com.google.gerrit.server.config.FactoryModule; import com.google.gerrit.server.config.GerritRequestModule; import com.google.gerrit.server.contact.ContactStore; import com.google.gerrit.server.contact.ContactStoreProvider; -import com.google.gerrit.server.ldap.LdapAuthModule; -import com.google.gerrit.server.openid.OpenIdModule; -import com.google.gerrit.server.rpc.UiRpcModule; import com.google.gerrit.server.ssh.SshInfo; +import com.google.gerrit.server.ssh.SshKeyCache; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.ProvisionException; @@ -41,15 +44,20 @@ import java.net.SocketAddress; class WebModule extends FactoryModule { private final Provider sshInfoProvider; + private final Provider sshKeyCacheProvider; private final AuthType loginType; @Inject - WebModule(final Provider sshInfoProvider, final AuthConfig authConfig) { - this(sshInfoProvider, authConfig.getAuthType()); + WebModule(final Provider sshInfoProvider, + final Provider sshKeyCacheProvider, + final AuthConfig authConfig) { + this(sshInfoProvider, sshKeyCacheProvider, authConfig.getAuthType()); } - WebModule(final Provider sshInfoProvider, final AuthType loginType) { + WebModule(final Provider sshInfoProvider, + final Provider sshKeyCacheProvider, final AuthType loginType) { this.sshInfoProvider = sshInfoProvider; + this.sshKeyCacheProvider = sshKeyCacheProvider; this.loginType = loginType; } @@ -94,6 +102,8 @@ class WebModule extends FactoryModule { install(new GerritRequestModule()); bind(SshInfo.class).toProvider(sshInfoProvider); + bind(SshKeyCache.class).toProvider(sshKeyCacheProvider); + bind(ContactStore.class).toProvider(ContactStoreProvider.class).in( SINGLETON); bind(GerritConfig.class).toProvider(GerritConfigProvider.class).in( diff --git a/src/main/java/com/google/gerrit/server/http/WebSession.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSession.java similarity index 95% rename from src/main/java/com/google/gerrit/server/http/WebSession.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSession.java index 7ec63d1819..b6f3c12339 100644 --- a/src/main/java/com/google/gerrit/server/http/WebSession.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSession.java @@ -12,11 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import static java.util.concurrent.TimeUnit.HOURS; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.httpd.WebSessionManager.Key; +import com.google.gerrit.httpd.WebSessionManager.Val; +import com.google.gerrit.reviewdb.Account; import com.google.gerrit.server.AccessPath; import com.google.gerrit.server.AnonymousUser; import com.google.gerrit.server.CurrentUser; @@ -24,8 +26,6 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.cache.EvictionPolicy; -import com.google.gerrit.server.http.WebSessionManager.Key; -import com.google.gerrit.server.http.WebSessionManager.Val; import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.TypeLiteral; @@ -120,7 +120,7 @@ public final class WebSession { return isSignedIn() ? key.getToken() : null; } - boolean isTokenValid(final String inputToken) { + public boolean isTokenValid(final String inputToken) { return isSignedIn() && key.getToken().equals(inputToken); } diff --git a/src/main/java/com/google/gerrit/server/http/WebSessionManager.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java similarity index 98% rename from src/main/java/com/google/gerrit/server/http/WebSessionManager.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java index e93cbf51c1..aaa254fe76 100644 --- a/src/main/java/com/google/gerrit/server/http/WebSessionManager.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import static com.google.gerrit.server.ioutil.BasicSerialization.readFixInt64; import static com.google.gerrit.server.ioutil.BasicSerialization.readString; @@ -25,7 +25,7 @@ import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; import com.google.gerrit.server.cache.Cache; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/src/main/webapp/WEB-INF/BecomeAnyAccount.html b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html similarity index 100% rename from src/main/webapp/WEB-INF/BecomeAnyAccount.html rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html diff --git a/src/main/java/com/google/gerrit/server/http/BecomeAnyAccountLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java similarity index 92% rename from src/main/java/com/google/gerrit/server/http/BecomeAnyAccountLoginServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java index 6ef5e01f06..d823db5fee 100644 --- a/src/main/java/com/google/gerrit/server/http/BecomeAnyAccountLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java @@ -12,10 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.auth.become; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.httpd.HtmlDomUtil; +import com.google.gerrit.httpd.WebSession; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.Nullable; import com.google.gwtorm.client.OrmException; @@ -53,10 +55,10 @@ public class BecomeAnyAccountLoginServlet extends HttpServlet { schema = sf; urlProvider = up; - final String hostPageName = "WEB-INF/BecomeAnyAccount.html"; - final String doc = HtmlDomUtil.readFile(servletContext, "/" + hostPageName); + final String pageName = "BecomeAnyAccount.html"; + final String doc = HtmlDomUtil.readFile(getClass(), pageName); if (doc == null) { - throw new FileNotFoundException("No " + hostPageName + " in webapp"); + throw new FileNotFoundException("No " + pageName + " in webapp"); } raw = doc.getBytes(HtmlDomUtil.ENC); diff --git a/src/main/java/com/google/gerrit/server/http/HttpAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java similarity index 90% rename from src/main/java/com/google/gerrit/server/http/HttpAuthFilter.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java index 3b2e93acab..1afd72de01 100644 --- a/src/main/java/com/google/gerrit/server/http/HttpAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java @@ -12,8 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.auth.container; +import com.google.gerrit.httpd.HtmlDomUtil; +import com.google.gerrit.httpd.WebSession; +import com.google.gerrit.httpd.raw.HostPageServlet; import com.google.gwt.user.server.rpc.RPCServletUtils; import com.google.inject.Inject; import com.google.inject.Provider; @@ -54,10 +57,10 @@ class HttpAuthFilter implements Filter { final ServletContext servletContext) throws IOException { this.webSession = webSession; - final String hostPageName = "WEB-INF/LoginRedirect.html"; - final String doc = HtmlDomUtil.readFile(servletContext, "/" + hostPageName); + final String pageName = "LoginRedirect.html"; + final String doc = HtmlDomUtil.readFile(getClass(), pageName); if (doc == null) { - throw new FileNotFoundException("No " + hostPageName + " in webapp"); + throw new FileNotFoundException("No " + pageName + " in webapp"); } signInRaw = doc.getBytes(HtmlDomUtil.ENC); diff --git a/src/main/java/com/google/gerrit/server/http/HttpAuthModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java similarity index 89% rename from src/main/java/com/google/gerrit/server/http/HttpAuthModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java index ec2ba20f41..553b1f4217 100644 --- a/src/main/java/com/google/gerrit/server/http/HttpAuthModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthModule.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.auth.container; import com.google.inject.servlet.ServletModule; /** Servlets and support related to HTTP authentication. */ -class HttpAuthModule extends ServletModule { +public class HttpAuthModule extends ServletModule { @Override protected void configureServlets() { filter("/").through(HttpAuthFilter.class); diff --git a/src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java similarity index 95% rename from src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java index 665ff3f948..8ea4f2f132 100644 --- a/src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.auth.container; -import com.google.gerrit.client.Link; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.httpd.WebSession; import com.google.gerrit.server.account.AccountException; import com.google.gerrit.server.account.AccountManager; import com.google.gerrit.server.account.AuthRequest; @@ -26,9 +27,9 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import org.eclipse.jgit.util.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.eclipse.jgit.util.Base64; import java.io.IOException; @@ -98,8 +99,8 @@ class HttpLoginServlet extends HttpServlet { final StringBuilder rdr = new StringBuilder(); rdr.append(urlProvider.get()); rdr.append('#'); - if (arsp.isNew() && !token.startsWith(Link.REGISTER + ",")) { - rdr.append(Link.REGISTER); + if (arsp.isNew() && !token.startsWith(PageLinks.REGISTER + ",")) { + rdr.append(PageLinks.REGISTER); rdr.append(','); } rdr.append(token); @@ -117,7 +118,7 @@ class HttpLoginServlet extends HttpServlet { token = token.substring(1); } if (token == null || token.isEmpty()) { - token = Link.MINE; + token = PageLinks.MINE; } return token; } diff --git a/src/main/webapp/WEB-INF/LoginRedirect.html b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/LoginRedirect.html similarity index 100% rename from src/main/webapp/WEB-INF/LoginRedirect.html rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/LoginRedirect.html diff --git a/src/main/java/com/google/gerrit/server/ldap/LdapAuthModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapAuthModule.java similarity index 88% rename from src/main/java/com/google/gerrit/server/ldap/LdapAuthModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapAuthModule.java index 660f7f02d6..c46edc3808 100644 --- a/src/main/java/com/google/gerrit/server/ldap/LdapAuthModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapAuthModule.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ldap; +package com.google.gerrit.httpd.auth.ldap; -import com.google.gerrit.server.http.RpcServletModule; -import com.google.gerrit.server.rpc.UiRpcModule; +import com.google.gerrit.httpd.rpc.RpcServletModule; +import com.google.gerrit.httpd.rpc.UiRpcModule; import com.google.inject.servlet.ServletModule; /** RPC support related to username/password LDAP authentication. */ diff --git a/src/main/java/com/google/gerrit/server/ldap/LoginRedirectServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java similarity index 89% rename from src/main/java/com/google/gerrit/server/ldap/LoginRedirectServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java index 62366d04f4..0952d87e2c 100644 --- a/src/main/java/com/google/gerrit/server/ldap/LoginRedirectServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ldap; +package com.google.gerrit.httpd.auth.ldap; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.SignInDialog; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.auth.SignInMode; +import com.google.gerrit.httpd.WebSession; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.Nullable; -import com.google.gerrit.server.http.WebSession; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -49,7 +49,7 @@ class LoginRedirectServlet extends HttpServlet { token = getToken(req); } else { final String msg = "Session cookie not available."; - token = "SignInFailure," + SignInDialog.Mode.SIGN_IN + "," + msg; + token = "SignInFailure," + SignInMode.SIGN_IN + "," + msg; } final StringBuilder rdr = new StringBuilder(); @@ -69,7 +69,7 @@ class LoginRedirectServlet extends HttpServlet { token = token.substring(1); } if (token == null || token.isEmpty()) { - token = Link.MINE; + token = PageLinks.MINE; } return token; } diff --git a/src/main/java/com/google/gerrit/server/ldap/UserPassAuthServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/UserPassAuthServiceImpl.java similarity index 90% rename from src/main/java/com/google/gerrit/server/ldap/UserPassAuthServiceImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/UserPassAuthServiceImpl.java index 80da01110b..afe7ea6e4d 100644 --- a/src/main/java/com/google/gerrit/server/ldap/UserPassAuthServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/UserPassAuthServiceImpl.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ldap; +package com.google.gerrit.httpd.auth.ldap; -import com.google.gerrit.client.auth.userpass.UserPassAuthService; -import com.google.gerrit.client.auth.userpass.LoginResult; +import com.google.gerrit.common.auth.userpass.LoginResult; +import com.google.gerrit.common.auth.userpass.UserPassAuthService; +import com.google.gerrit.httpd.WebSession; import com.google.gerrit.server.account.AccountException; import com.google.gerrit.server.account.AccountManager; import com.google.gerrit.server.account.AuthRequest; import com.google.gerrit.server.account.AuthResult; -import com.google.gerrit.server.http.WebSession; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/src/main/java/com/google/gerrit/server/openid/OpenIdLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java similarity index 97% rename from src/main/java/com/google/gerrit/server/openid/OpenIdLoginServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java index f5ecb36ebc..cfb767d0ba 100644 --- a/src/main/java/com/google/gerrit/server/openid/OpenIdLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.openid; +package com.google.gerrit.httpd.auth.openid; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/src/main/java/com/google/gerrit/server/openid/OpenIdModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdModule.java similarity index 89% rename from src/main/java/com/google/gerrit/server/openid/OpenIdModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdModule.java index 4205794585..f6ef51a685 100644 --- a/src/main/java/com/google/gerrit/server/openid/OpenIdModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdModule.java @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.openid; +package com.google.gerrit.httpd.auth.openid; import static java.util.concurrent.TimeUnit.MINUTES; +import com.google.gerrit.httpd.rpc.RpcServletModule; import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.CacheModule; -import com.google.gerrit.server.http.RpcServletModule; -import com.google.gerrit.server.rpc.UiRpcModule; import com.google.inject.TypeLiteral; import com.google.inject.servlet.ServletModule; @@ -44,7 +43,7 @@ public class OpenIdModule extends ServletModule { serve("/" + OpenIdServiceImpl.RETURN_URL).with(OpenIdLoginServlet.class); - install(new RpcServletModule(UiRpcModule.PREFIX) { + install(new RpcServletModule(RpcServletModule.PREFIX) { @Override protected void configureServlets() { rpc(OpenIdServiceImpl.class); diff --git a/src/main/java/com/google/gerrit/server/openid/OpenIdServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java similarity index 93% rename from src/main/java/com/google/gerrit/server/openid/OpenIdServiceImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java index aa956df4d4..ff2704ae91 100644 --- a/src/main/java/com/google/gerrit/server/openid/OpenIdServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.openid; +package com.google.gerrit.httpd.auth.openid; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.SignInDialog; -import com.google.gerrit.client.SignInDialog.Mode; -import com.google.gerrit.client.auth.openid.DiscoveryResult; -import com.google.gerrit.client.auth.openid.OpenIdService; -import com.google.gerrit.client.auth.openid.OpenIdUtil; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.auth.SignInMode; +import com.google.gerrit.common.auth.openid.DiscoveryResult; +import com.google.gerrit.common.auth.openid.OpenIdService; +import com.google.gerrit.common.auth.openid.OpenIdUrls; +import com.google.gerrit.httpd.WebSession; +import com.google.gerrit.reviewdb.Account; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.UrlEncoded; import com.google.gerrit.server.account.AccountException; @@ -29,7 +29,6 @@ import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.SelfPopulatingCache; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.Nullable; -import com.google.gerrit.server.http.WebSession; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtorm.client.KeyUtil; import com.google.inject.Inject; @@ -119,7 +118,7 @@ class OpenIdServiceImpl implements OpenIdService { } public void discover(final String openidIdentifier, - final SignInDialog.Mode mode, final boolean remember, + final SignInMode mode, final boolean remember, final String returnToken, final AsyncCallback callback) { final State state; state = init(openidIdentifier, mode, remember, returnToken); @@ -188,7 +187,7 @@ class OpenIdServiceImpl implements OpenIdService { // Process the authentication response. // - final SignInDialog.Mode mode = signInMode(req); + final SignInMode mode = signInMode(req); final String openidIdentifier = req.getParameter("openid.identity"); final String claimedIdentifier = req.getParameter(P_CLAIMED); final String returnToken = req.getParameter(P_TOKEN); @@ -336,7 +335,7 @@ class OpenIdServiceImpl implements OpenIdService { final com.google.gerrit.server.account.AuthResult arsp; arsp = accountManager.authenticate(areq); - final Cookie lastId = new Cookie(OpenIdUtil.LASTID_COOKIE, ""); + final Cookie lastId = new Cookie(OpenIdUrls.LASTID_COOKIE, ""); lastId.setPath(req.getContextPath() + "/"); if (remember) { lastId.setValue(rediscoverIdentifier); @@ -368,7 +367,7 @@ class OpenIdServiceImpl implements OpenIdService { } } - private boolean isSignIn(final SignInDialog.Mode mode) { + private boolean isSignIn(final SignInMode mode) { switch (mode) { case SIGN_IN: case REGISTER: @@ -378,11 +377,11 @@ class OpenIdServiceImpl implements OpenIdService { } } - private static Mode signInMode(final HttpServletRequest req) { + private static SignInMode signInMode(final HttpServletRequest req) { try { - return SignInDialog.Mode.valueOf(req.getParameter(P_MODE)); + return SignInMode.valueOf(req.getParameter(P_MODE)); } catch (RuntimeException e) { - return SignInDialog.Mode.SIGN_IN; + return SignInMode.SIGN_IN; } } @@ -390,14 +389,14 @@ class OpenIdServiceImpl implements OpenIdService { final HttpServletResponse rsp) throws IOException { String token = req.getParameter(P_TOKEN); if (token == null || token.isEmpty() || token.startsWith("SignInFailure,")) { - token = Link.MINE; + token = PageLinks.MINE; } final StringBuilder rdr = new StringBuilder(); rdr.append(urlProvider.get()); rdr.append('#'); - if (isNew && !token.startsWith(Link.REGISTER + ",")) { - rdr.append(Link.REGISTER); + if (isNew && !token.startsWith(PageLinks.REGISTER + ",")) { + rdr.append(PageLinks.REGISTER); rdr.append(','); } rdr.append(token); @@ -415,7 +414,7 @@ class OpenIdServiceImpl implements OpenIdService { private void cancelWithError(final HttpServletRequest req, final HttpServletResponse rsp, final String errorDetail) throws IOException { - final SignInDialog.Mode mode = signInMode(req); + final SignInMode mode = signInMode(req); if (isSignIn(mode)) { webSession.get().logout(); } @@ -431,7 +430,7 @@ class OpenIdServiceImpl implements OpenIdService { } private State init(final String openidIdentifier, - final SignInDialog.Mode mode, final boolean remember, + final SignInMode mode, final boolean remember, final String returnToken) { final List list = discoveryCache.get(openidIdentifier); if (list == null || list.isEmpty()) { diff --git a/src/main/java/com/google/gerrit/server/http/CatServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java similarity index 96% rename from src/main/java/com/google/gerrit/server/http/CatServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java index 01b3590ccb..3ecfa627c7 100644 --- a/src/main/java/com/google/gerrit/server/http/CatServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.raw; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.git.GitRepositoryManager; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.FileTypeRegistry; +import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gwtorm.client.OrmException; diff --git a/src/main/webapp/WEB-INF/HostPage.html b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPage.html similarity index 100% rename from src/main/webapp/WEB-INF/HostPage.html rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPage.html diff --git a/src/main/java/com/google/gerrit/server/http/HostPageServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java similarity index 95% rename from src/main/java/com/google/gerrit/server/http/HostPageServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java index e8149b655d..cc5ff425f2 100644 --- a/src/main/java/com/google/gerrit/server/http/HostPageServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.raw; -import com.google.gerrit.client.HostPageData; -import com.google.gerrit.client.data.GerritConfig; +import com.google.gerrit.common.data.GerritConfig; +import com.google.gerrit.common.data.HostPageData; +import com.google.gerrit.httpd.HtmlDomUtil; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.CanonicalWebUrl; @@ -68,10 +69,10 @@ public class HostPageServlet extends HttpServlet { config = gc; wantSSL = configuredUrl != null && configuredUrl.startsWith("https:"); - final String hostPageName = "WEB-INF/HostPage.html"; - hostDoc = HtmlDomUtil.parseFile(servletContext, "/" + hostPageName); + final String pageName = "HostPage.html"; + hostDoc = HtmlDomUtil.parseFile(getClass(), pageName); if (hostDoc == null) { - throw new FileNotFoundException("No " + hostPageName + " in webapp"); + throw new FileNotFoundException("No " + pageName + " in webapp"); } fixModuleReference(hostDoc, servletContext); injectCssFile(hostDoc, "gerrit_sitecss", sitePath, "GerritSite.css"); diff --git a/src/main/webapp/WEB-INF/LegacyGerrit.html b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerrit.html similarity index 100% rename from src/main/webapp/WEB-INF/LegacyGerrit.html rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerrit.html diff --git a/src/main/java/com/google/gerrit/server/http/LegacyGerritServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java similarity index 90% rename from src/main/java/com/google/gerrit/server/http/LegacyGerritServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java index f5e5818007..5a72230931 100644 --- a/src/main/java/com/google/gerrit/server/http/LegacyGerritServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java @@ -12,8 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.raw; +import com.google.gerrit.httpd.HtmlDomUtil; import com.google.gwt.user.server.rpc.RPCServletUtils; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -44,10 +45,10 @@ public class LegacyGerritServlet extends HttpServlet { @Inject LegacyGerritServlet(final ServletContext servletContext) throws IOException { - final String hostPageName = "WEB-INF/LegacyGerrit.html"; - final String doc = HtmlDomUtil.readFile(servletContext, "/" + hostPageName); + final String pageName = "LegacyGerrit.html"; + final String doc = HtmlDomUtil.readFile(getClass(), pageName); if (doc == null) { - throw new FileNotFoundException("No " + hostPageName + " in webapp"); + throw new FileNotFoundException("No " + pageName + " in webapp"); } raw = doc.getBytes(HtmlDomUtil.ENC); diff --git a/src/main/java/com/google/gerrit/server/http/PrettifyServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/PrettifyServlet.java similarity index 98% rename from src/main/java/com/google/gerrit/server/http/PrettifyServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/PrettifyServlet.java index eb94f6f0c7..7b9bda2eb8 100644 --- a/src/main/java/com/google/gerrit/server/http/PrettifyServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/PrettifyServlet.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.raw; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/src/main/java/com/google/gerrit/server/http/SshServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java similarity index 77% rename from src/main/java/com/google/gerrit/server/http/SshServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java index 7756e5ffda..6078c4efc2 100644 --- a/src/main/java/com/google/gerrit/server/http/SshServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.raw; import com.google.gerrit.server.ssh.SshInfo; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.jcraft.jsch.HostKey; + import java.io.IOException; import java.io.PrintWriter; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.InetSocketAddress; +import java.util.List; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -49,11 +49,11 @@ import javax.servlet.http.HttpServletResponse; */ @SuppressWarnings("serial") @Singleton -public class SshServlet extends HttpServlet { +public class SshInfoServlet extends HttpServlet { private final SshInfo sshd; @Inject - SshServlet(final SshInfo daemon) { + SshInfoServlet(final SshInfo daemon) { sshd = daemon; } @@ -64,19 +64,26 @@ public class SshServlet extends HttpServlet { rsp.setHeader("Pragma", "no-cache"); rsp.setHeader("Cache-Control", "no-cache, must-revalidate"); - final InetSocketAddress addr = sshd.getAddress(); + final List hostKeys = sshd.getHostKeys(); final String out; - if (addr != null) { - final InetAddress ip = addr.getAddress(); - String host; - if (ip != null && ip.isAnyLocalAddress()) { - host = req.getServerName(); - } else if (ip instanceof Inet6Address) { - host = "[" + addr.getHostName() + "]"; - } else { - host = addr.getHostName(); + if (!hostKeys.isEmpty()) { + String host = hostKeys.get(0).getHost(); + String port = "22"; + + if (host.contains(":")) { + final int p = host.lastIndexOf(':'); + port = host.substring(p + 1); + host = host.substring(0, p); } - out = host + " " + addr.getPort(); + + if (host.equals("*")) { + host = req.getServerName(); + + } else if (host.startsWith("[") && host.endsWith("]")) { + host = host.substring(1, host.length() - 1); + } + + out = host + " " + port; } else { out = "NOT_AVAILABLE"; } diff --git a/src/main/java/com/google/gerrit/server/http/StaticServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/StaticServlet.java similarity index 99% rename from src/main/java/com/google/gerrit/server/http/StaticServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/StaticServlet.java index a075c5eafa..41ff2c8df9 100644 --- a/src/main/java/com/google/gerrit/server/http/StaticServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/StaticServlet.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.raw; import com.google.gerrit.server.config.SitePath; import com.google.gwt.user.server.rpc.RPCServletUtils; diff --git a/src/main/java/com/google/gerrit/server/BaseServiceImplementation.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java similarity index 92% rename from src/main/java/com/google/gerrit/server/BaseServiceImplementation.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java index 8fcd9e81ad..b428c9a0ad 100644 --- a/src/main/java/com/google/gerrit/server/BaseServiceImplementation.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java @@ -12,12 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server; +package com.google.gerrit.httpd.rpc; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.rpc.CorruptEntityException; -import com.google.gerrit.client.rpc.NoSuchEntityException; +import com.google.gerrit.common.errors.CorruptEntityException; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.server.CurrentUser; +import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.NoSuchGroupException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.NoSuchProjectException; diff --git a/src/main/java/com/google/gerrit/server/rpc/ChangeListServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/ChangeListServiceImpl.java similarity index 95% rename from src/main/java/com/google/gerrit/server/rpc/ChangeListServiceImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/ChangeListServiceImpl.java index 88b5224cf2..c85497086f 100644 --- a/src/main/java/com/google/gerrit/server/rpc/ChangeListServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/ChangeListServiceImpl.java @@ -12,26 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc; +package com.google.gerrit.httpd.rpc; -import com.google.gerrit.client.changes.ChangeListService; -import com.google.gerrit.client.changes.ToggleStarRequest; -import com.google.gerrit.client.data.AccountDashboardInfo; -import com.google.gerrit.client.data.ChangeInfo; -import com.google.gerrit.client.data.SingleListChangeInfo; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeAccess; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.RevId; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.StarredChange; -import com.google.gerrit.client.rpc.NoSuchEntityException; -import com.google.gerrit.server.BaseServiceImplementation; +import com.google.gerrit.common.data.AccountDashboardInfo; +import com.google.gerrit.common.data.ChangeInfo; +import com.google.gerrit.common.data.ChangeListService; +import com.google.gerrit.common.data.SingleListChangeInfo; +import com.google.gerrit.common.data.ToggleStarRequest; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeAccess; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.RevId; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.StarredChange; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountInfoCacheFactory; import com.google.gerrit.server.project.ChangeControl; diff --git a/src/main/java/com/google/gerrit/server/http/GerritJsonServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java similarity index 94% rename from src/main/java/com/google/gerrit/server/http/GerritJsonServlet.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java index c61bdf5715..8f7754a55c 100644 --- a/src/main/java/com/google/gerrit/server/http/GerritJsonServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.rpc; -import com.google.gerrit.client.rpc.NotSignedInException; -import com.google.gerrit.client.rpc.SignInRequired; +import com.google.gerrit.common.auth.SignInRequired; +import com.google.gerrit.common.errors.NotSignedInException; +import com.google.gerrit.httpd.WebSession; import com.google.gson.GsonBuilder; import com.google.gwtjsonrpc.client.RemoteJsonService; import com.google.gwtjsonrpc.server.ActiveCall; diff --git a/src/main/java/com/google/gerrit/server/http/GerritJsonServletProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java similarity index 97% rename from src/main/java/com/google/gerrit/server/http/GerritJsonServletProvider.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java index 3709403653..823ee7a60a 100644 --- a/src/main/java/com/google/gerrit/server/http/GerritJsonServletProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.rpc; import com.google.gwtjsonrpc.client.RemoteJsonService; import com.google.inject.AbstractModule; diff --git a/src/main/java/com/google/gerrit/server/rpc/Handler.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java similarity index 93% rename from src/main/java/com/google/gerrit/server/rpc/Handler.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java index 831a0ae32e..0c0a8ce655 100644 --- a/src/main/java/com/google/gerrit/server/rpc/Handler.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/Handler.java @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc; +package com.google.gerrit.httpd.rpc; -import com.google.gerrit.client.rpc.CorruptEntityException; -import com.google.gerrit.client.rpc.NoSuchEntityException; -import com.google.gerrit.server.BaseServiceImplementation; +import com.google.gerrit.common.errors.CorruptEntityException; +import com.google.gerrit.common.errors.NoSuchEntityException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gwt.user.client.rpc.AsyncCallback; diff --git a/src/main/java/com/google/gerrit/server/http/RpcServletModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java similarity index 94% rename from src/main/java/com/google/gerrit/server/http/RpcServletModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java index a13de8be8d..29abee6382 100644 --- a/src/main/java/com/google/gerrit/server/http/RpcServletModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/RpcServletModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd.rpc; import com.google.gwtjsonrpc.client.RemoteJsonService; import com.google.inject.Key; @@ -22,6 +22,8 @@ import com.google.inject.servlet.ServletModule; /** Binds {@link RemoteJsonService} implementations to a JSON servlet. */ public abstract class RpcServletModule extends ServletModule { + public static final String PREFIX = "/gerrit/rpc/"; + private final String prefix; protected RpcServletModule(final String pathPrefix) { diff --git a/src/main/java/com/google/gerrit/server/rpc/SuggestServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java similarity index 90% rename from src/main/java/com/google/gerrit/server/rpc/SuggestServiceImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java index 7d601c01fe..de800bba60 100644 --- a/src/main/java/com/google/gerrit/server/rpc/SuggestServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java @@ -12,16 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc; +package com.google.gerrit.httpd.rpc; -import com.google.gerrit.client.data.AccountInfo; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.ui.SuggestService; -import com.google.gerrit.server.BaseServiceImplementation; +import com.google.gerrit.common.data.AccountInfo; +import com.google.gerrit.common.data.SuggestService; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.project.ProjectCache; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java new file mode 100644 index 0000000000..fb2bdf1dd6 --- /dev/null +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java @@ -0,0 +1,78 @@ +// Copyright (C) 2008 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.httpd.rpc; + +import com.google.gerrit.common.data.SshHostKey; +import com.google.gerrit.common.data.SystemInfoService; +import com.google.gerrit.reviewdb.ContributorAgreement; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.server.ssh.SshInfo; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwtorm.client.OrmException; +import com.google.gwtorm.client.SchemaFactory; +import com.google.inject.Inject; +import com.google.inject.Provider; + +import com.jcraft.jsch.HostKey; +import com.jcraft.jsch.JSch; + +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; + +class SystemInfoServiceImpl implements SystemInfoService { + private static final JSch JSCH = new JSch(); + + private final SchemaFactory schema; + private final List hostKeys; + private final Provider httpRequest; + + @Inject + SystemInfoServiceImpl(final SchemaFactory sf, final SshInfo daemon, + final Provider hsr) { + schema = sf; + hostKeys = daemon.getHostKeys(); + httpRequest = hsr; + } + + public void contributorAgreements( + final AsyncCallback> callback) { + try { + final ReviewDb db = schema.open(); + try { + callback.onSuccess(db.contributorAgreements().active().toList()); + } finally { + db.close(); + } + } catch (OrmException e) { + callback.onFailure(e); + } + } + + public void daemonHostKeys(final AsyncCallback> callback) { + final ArrayList r = new ArrayList(hostKeys.size()); + for (final HostKey hk : hostKeys) { + String host = hk.getHost(); + if (host.startsWith("*:")) { + final String port = host.substring(2); + host = "[" + httpRequest.get().getServerName() + "]:" + port; + } + final String fp = hk.getFingerPrint(JSCH); + r.add(new SshHostKey(host, hk.getType() + " " + hk.getKey(), fp)); + } + callback.onSuccess(r); + } +} diff --git a/src/main/java/com/google/gerrit/server/rpc/UiRpcModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/UiRpcModule.java similarity index 73% rename from src/main/java/com/google/gerrit/server/rpc/UiRpcModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/UiRpcModule.java index 2d671710dd..7de332aad5 100644 --- a/src/main/java/com/google/gerrit/server/rpc/UiRpcModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/UiRpcModule.java @@ -12,18 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc; +package com.google.gerrit.httpd.rpc; -import com.google.gerrit.server.http.RpcServletModule; -import com.google.gerrit.server.rpc.account.AccountModule; -import com.google.gerrit.server.rpc.changedetail.ChangeModule; -import com.google.gerrit.server.rpc.patch.PatchModule; -import com.google.gerrit.server.rpc.project.ProjectModule; +import com.google.gerrit.httpd.rpc.account.AccountModule; +import com.google.gerrit.httpd.rpc.changedetail.ChangeModule; +import com.google.gerrit.httpd.rpc.patch.PatchModule; +import com.google.gerrit.httpd.rpc.project.ProjectModule; /** Registers servlets to answer RPCs from client UI. */ public class UiRpcModule extends RpcServletModule { - public static final String PREFIX = "/gerrit/rpc/"; - public UiRpcModule() { super(PREFIX); } diff --git a/src/main/java/com/google/gerrit/server/rpc/account/AccountModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountModule.java similarity index 89% rename from src/main/java/com/google/gerrit/server/rpc/account/AccountModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountModule.java index ea56108688..ab7f857b8c 100644 --- a/src/main/java/com/google/gerrit/server/rpc/account/AccountModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountModule.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.account; +package com.google.gerrit.httpd.rpc.account; +import com.google.gerrit.httpd.rpc.RpcServletModule; +import com.google.gerrit.httpd.rpc.UiRpcModule; import com.google.gerrit.server.config.FactoryModule; -import com.google.gerrit.server.http.RpcServletModule; -import com.google.gerrit.server.rpc.UiRpcModule; public class AccountModule extends RpcServletModule { public AccountModule() { diff --git a/src/main/java/com/google/gerrit/server/rpc/account/AccountSecurityImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java similarity index 87% rename from src/main/java/com/google/gerrit/server/rpc/account/AccountSecurityImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java index fed89b90a1..6f85e4287b 100644 --- a/src/main/java/com/google/gerrit/server/rpc/account/AccountSecurityImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java @@ -12,23 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.account; +package com.google.gerrit.httpd.rpc.account; -import com.google.gerrit.client.account.AccountSecurity; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountAgreement; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountSshKey; -import com.google.gerrit.client.reviewdb.ContactInformation; -import com.google.gerrit.client.reviewdb.ContributorAgreement; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.rpc.ContactInformationStoreException; -import com.google.gerrit.client.rpc.InvalidSshKeyException; -import com.google.gerrit.client.rpc.InvalidSshUserNameException; -import com.google.gerrit.client.rpc.NameAlreadyUsedException; -import com.google.gerrit.client.rpc.NoSuchEntityException; -import com.google.gerrit.server.BaseServiceImplementation; +import com.google.gerrit.common.data.AccountSecurity; +import com.google.gerrit.common.errors.ContactInformationStoreException; +import com.google.gerrit.common.errors.InvalidSshKeyException; +import com.google.gerrit.common.errors.InvalidSshUserNameException; +import com.google.gerrit.common.errors.NameAlreadyUsedException; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.httpd.rpc.BaseServiceImplementation; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountAgreement; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountSshKey; +import com.google.gerrit.reviewdb.ContactInformation; +import com.google.gerrit.reviewdb.ContributorAgreement; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountByEmailCache; import com.google.gerrit.server.account.AccountCache; @@ -41,7 +41,6 @@ import com.google.gerrit.server.contact.ContactStore; import com.google.gerrit.server.mail.EmailException; import com.google.gerrit.server.mail.RegisterNewEmailSender; import com.google.gerrit.server.ssh.SshKeyCache; -import com.google.gerrit.server.ssh.SshUtil; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.VoidResult; import com.google.gwtjsonrpc.server.ValidToken; @@ -51,14 +50,11 @@ import com.google.gwtorm.client.Transaction; import com.google.inject.Inject; import com.google.inject.Provider; +import org.eclipse.jgit.util.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.eclipse.jgit.util.Base64; import java.io.UnsupportedEncodingException; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.spec.InvalidKeySpecException; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -129,26 +125,15 @@ class AccountSecurityImpl extends BaseServiceImplementation implements max = Math.max(max, k.getKey().get()); } - String keyStr = keyText; - if (keyStr.startsWith("---- BEGIN SSH2 PUBLIC KEY ----")) { - keyStr = SshUtil.toOpenSshPublicKey(keyStr); - } - - final AccountSshKey newKey = - new AccountSshKey(new AccountSshKey.Id(me, max + 1), keyStr); + final AccountSshKey key; try { - SshUtil.parse(newKey); - } catch (NoSuchAlgorithmException e) { - throw new Failure(new InvalidSshKeyException()); - } catch (InvalidKeySpecException e) { - throw new Failure(new InvalidSshKeyException()); - } catch (NoSuchProviderException e) { - log.error("Cannot parse SSH key", e); - throw new Failure(new InvalidSshKeyException()); + key = sshKeyCache.create(new AccountSshKey.Id(me, max + 1), keyText); + } catch (InvalidSshKeyException e) { + throw new Failure(e); } - db.accountSshKeys().insert(Collections.singleton(newKey)); + db.accountSshKeys().insert(Collections.singleton(key)); uncacheSshKeys(me); - return newKey; + return key; } }); } diff --git a/src/main/java/com/google/gerrit/server/rpc/account/AccountServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java similarity index 90% rename from src/main/java/com/google/gerrit/server/rpc/account/AccountServiceImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java index b5bb239edc..e77023557d 100644 --- a/src/main/java/com/google/gerrit/server/rpc/account/AccountServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.account; +package com.google.gerrit.httpd.rpc.account; -import com.google.gerrit.client.account.AccountProjectWatchInfo; -import com.google.gerrit.client.account.AccountService; -import com.google.gerrit.client.account.AgreementInfo; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGeneralPreferences; -import com.google.gerrit.client.reviewdb.AccountProjectWatch; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.rpc.NoSuchEntityException; -import com.google.gerrit.server.BaseServiceImplementation; +import com.google.gerrit.common.data.AccountProjectWatchInfo; +import com.google.gerrit.common.data.AccountService; +import com.google.gerrit.common.data.AgreementInfo; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.httpd.rpc.BaseServiceImplementation; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGeneralPreferences; +import com.google.gerrit.reviewdb.AccountProjectWatch; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.project.NoSuchProjectException; diff --git a/src/main/java/com/google/gerrit/server/rpc/account/AgreementInfoFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java similarity index 84% rename from src/main/java/com/google/gerrit/server/rpc/account/AgreementInfoFactory.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java index bea6e821d2..8e22741746 100644 --- a/src/main/java/com/google/gerrit/server/rpc/account/AgreementInfoFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.account; +package com.google.gerrit.httpd.rpc.account; -import com.google.gerrit.client.account.AgreementInfo; -import com.google.gerrit.client.reviewdb.AccountAgreement; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountGroupAgreement; -import com.google.gerrit.client.reviewdb.ContributorAgreement; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.common.data.AgreementInfo; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.AccountAgreement; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroupAgreement; +import com.google.gerrit.reviewdb.ContributorAgreement; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.rpc.Handler; import com.google.inject.Inject; import java.util.ArrayList; diff --git a/src/main/java/com/google/gerrit/server/rpc/account/ExternalIdDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/ExternalIdDetailFactory.java similarity index 88% rename from src/main/java/com/google/gerrit/server/rpc/account/ExternalIdDetailFactory.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/ExternalIdDetailFactory.java index 3e46a0b72e..dacb9bb49a 100644 --- a/src/main/java/com/google/gerrit/server/rpc/account/ExternalIdDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/ExternalIdDetailFactory.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.account; +package com.google.gerrit.httpd.rpc.account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.AuthConfig; -import com.google.gerrit.server.rpc.Handler; import com.google.inject.Inject; import java.util.Collections; diff --git a/src/main/java/com/google/gerrit/server/rpc/account/GroupAdminServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/GroupAdminServiceImpl.java similarity index 95% rename from src/main/java/com/google/gerrit/server/rpc/account/GroupAdminServiceImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/GroupAdminServiceImpl.java index 27ccfab1fd..fa072c1156 100644 --- a/src/main/java/com/google/gerrit/server/rpc/account/GroupAdminServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/GroupAdminServiceImpl.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.account; +package com.google.gerrit.httpd.rpc.account; -import com.google.gerrit.client.admin.GroupAdminService; -import com.google.gerrit.client.admin.GroupDetail; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountGroupMember; -import com.google.gerrit.client.reviewdb.AccountGroupMemberAudit; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.rpc.NameAlreadyUsedException; -import com.google.gerrit.client.rpc.NoSuchAccountException; -import com.google.gerrit.client.rpc.NoSuchEntityException; -import com.google.gerrit.server.BaseServiceImplementation; +import com.google.gerrit.common.data.GroupAdminService; +import com.google.gerrit.common.data.GroupDetail; +import com.google.gerrit.common.errors.NameAlreadyUsedException; +import com.google.gerrit.common.errors.NoSuchAccountException; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.httpd.rpc.BaseServiceImplementation; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroupMember; +import com.google.gerrit.reviewdb.AccountGroupMemberAudit; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountResolver; diff --git a/src/main/java/com/google/gerrit/server/rpc/account/GroupDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/GroupDetailFactory.java similarity index 90% rename from src/main/java/com/google/gerrit/server/rpc/account/GroupDetailFactory.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/GroupDetailFactory.java index 6c4e95ae56..1b0566021e 100644 --- a/src/main/java/com/google/gerrit/server/rpc/account/GroupDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/GroupDetailFactory.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.account; +package com.google.gerrit.httpd.rpc.account; -import com.google.gerrit.client.admin.GroupDetail; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountGroupMember; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.common.data.GroupDetail; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroupMember; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.account.AccountInfoCacheFactory; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.account.GroupControl; import com.google.gerrit.server.account.NoSuchGroupException; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/account/MyGroupsFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/MyGroupsFactory.java similarity index 92% rename from src/main/java/com/google/gerrit/server/rpc/account/MyGroupsFactory.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/MyGroupsFactory.java index 68574bc458..b3e993e07d 100644 --- a/src/main/java/com/google/gerrit/server/rpc/account/MyGroupsFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/MyGroupsFactory.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.account; +package com.google.gerrit.httpd.rpc.account; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.AccountGroup; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.GroupCache; -import com.google.gerrit.server.rpc.Handler; import com.google.inject.Inject; import java.util.ArrayList; diff --git a/src/main/java/com/google/gerrit/server/rpc/changedetail/AbandonChange.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/AbandonChange.java similarity index 91% rename from src/main/java/com/google/gerrit/server/rpc/changedetail/AbandonChange.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/AbandonChange.java index b72bdcc7dc..ac5a0e7b21 100644 --- a/src/main/java/com/google/gerrit/server/rpc/changedetail/AbandonChange.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/AbandonChange.java @@ -12,15 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.changedetail; +package com.google.gerrit.httpd.rpc.changedetail; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeMessage; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.rpc.NoSuchEntityException; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.Nullable; @@ -29,7 +30,6 @@ import com.google.gerrit.server.mail.EmailException; import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.OrmRunnable; import com.google.gwtorm.client.Transaction; diff --git a/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java similarity index 89% rename from src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeDetailFactory.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java index 4a45e5f83f..102b41c1d5 100644 --- a/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailFactory.java @@ -12,29 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.changedetail; +package com.google.gerrit.httpd.rpc.changedetail; -import com.google.gerrit.client.data.ApprovalDetail; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.data.ChangeInfo; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeMessage; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetAncestor; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.RevId; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.rpc.NoSuchEntityException; +import com.google.gerrit.common.data.ApprovalDetail; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.common.data.ChangeInfo; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetAncestor; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.RevId; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.account.AccountInfoCacheFactory; import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; -import com.google.gerrit.server.rpc.Handler; import com.google.gerrit.server.workflow.CategoryFunction; import com.google.gerrit.server.workflow.FunctionState; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeDetailServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailServiceImpl.java similarity index 82% rename from src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeDetailServiceImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailServiceImpl.java index 9acc0d1543..12fc41d5fc 100644 --- a/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeDetailServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailServiceImpl.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.changedetail; +package com.google.gerrit.httpd.rpc.changedetail; -import com.google.gerrit.client.changes.ChangeDetailService; -import com.google.gerrit.client.changes.PatchSetPublishDetail; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.data.PatchSetDetail; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSet; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.common.data.ChangeDetailService; +import com.google.gerrit.common.data.PatchSetDetail; +import com.google.gerrit.common.data.PatchSetPublishDetail; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeManageServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeManageServiceImpl.java similarity index 87% rename from src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeManageServiceImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeManageServiceImpl.java index fe6e0f36ce..196d400de6 100644 --- a/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeManageServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeManageServiceImpl.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.changedetail; +package com.google.gerrit.httpd.rpc.changedetail; -import com.google.gerrit.client.changes.ChangeManageService; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.reviewdb.PatchSet; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.common.data.ChangeManageService; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeModule.java similarity index 89% rename from src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeModule.java index ad44933eb8..211f505337 100644 --- a/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeModule.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.changedetail; +package com.google.gerrit.httpd.rpc.changedetail; +import com.google.gerrit.httpd.rpc.RpcServletModule; +import com.google.gerrit.httpd.rpc.UiRpcModule; import com.google.gerrit.server.config.FactoryModule; -import com.google.gerrit.server.http.RpcServletModule; -import com.google.gerrit.server.rpc.UiRpcModule; public class ChangeModule extends RpcServletModule { public ChangeModule() { diff --git a/src/main/java/com/google/gerrit/server/rpc/changedetail/PatchSetDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java similarity index 88% rename from src/main/java/com/google/gerrit/server/rpc/changedetail/PatchSetDetailFactory.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java index ea96a130d5..6898df3ddf 100644 --- a/src/main/java/com/google/gerrit/server/rpc/changedetail/PatchSetDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java @@ -12,16 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.changedetail; +package com.google.gerrit.httpd.rpc.changedetail; -import com.google.gerrit.client.data.PatchSetDetail; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountPatchReview; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.rpc.NoSuchEntityException; +import com.google.gerrit.common.data.PatchSetDetail; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountPatchReview; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.patch.PatchList; @@ -30,7 +31,6 @@ import com.google.gerrit.server.patch.PatchSetInfoFactory; import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/changedetail/PatchSetPublishDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetPublishDetailFactory.java similarity index 85% rename from src/main/java/com/google/gerrit/server/rpc/changedetail/PatchSetPublishDetailFactory.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetPublishDetailFactory.java index d5e16a6f88..ca12b8fa36 100644 --- a/src/main/java/com/google/gerrit/server/rpc/changedetail/PatchSetPublishDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetPublishDetailFactory.java @@ -12,22 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.changedetail; +package com.google.gerrit.httpd.rpc.changedetail; -import com.google.gerrit.client.changes.PatchSetPublishDetail; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.PatchSetInfo; -import com.google.gerrit.client.reviewdb.ProjectRight; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.common.data.AccountInfoCache; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.PatchSetPublishDetail; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.PatchSetInfo; +import com.google.gerrit.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountInfoCacheFactory; import com.google.gerrit.server.patch.PatchSetInfoFactory; @@ -36,7 +37,6 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/changedetail/SubmitAction.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/SubmitAction.java similarity index 88% rename from src/main/java/com/google/gerrit/server/rpc/changedetail/SubmitAction.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/SubmitAction.java index 8f9b5c362d..a9e48c46d6 100644 --- a/src/main/java/com/google/gerrit/server/rpc/changedetail/SubmitAction.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/SubmitAction.java @@ -12,24 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.changedetail; +package com.google.gerrit.httpd.rpc.changedetail; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.SUBMIT; +import static com.google.gerrit.reviewdb.ApprovalCategory.SUBMIT; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.data.ChangeDetail; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.rpc.NoSuchEntityException; -import com.google.gerrit.git.MergeQueue; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.ChangeDetail; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.IdentifiedUser; +import com.google.gerrit.server.git.MergeQueue; import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gerrit.server.project.NoSuchChangeException; -import com.google.gerrit.server.rpc.Handler; import com.google.gerrit.server.workflow.CategoryFunction; import com.google.gerrit.server.workflow.FunctionState; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/server/rpc/patch/AddReviewer.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/AddReviewer.java similarity index 89% rename from src/main/java/com/google/gerrit/server/rpc/patch/AddReviewer.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/AddReviewer.java index f74935c907..f57c08c65d 100644 --- a/src/main/java/com/google/gerrit/server/rpc/patch/AddReviewer.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/AddReviewer.java @@ -12,23 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.patch; +package com.google.gerrit.httpd.rpc.patch; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.patches.AddReviewerResult; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.common.data.AddReviewerResult; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.httpd.rpc.changedetail.ChangeDetailFactory; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountResolver; import com.google.gerrit.server.mail.AddReviewerSender; import com.google.gerrit.server.project.ChangeControl; -import com.google.gerrit.server.rpc.Handler; -import com.google.gerrit.server.rpc.changedetail.ChangeDetailFactory; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.OrmRunnable; import com.google.gwtorm.client.Transaction; diff --git a/src/main/java/com/google/gerrit/server/rpc/patch/CommentDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/CommentDetailFactory.java similarity index 90% rename from src/main/java/com/google/gerrit/server/rpc/patch/CommentDetailFactory.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/CommentDetailFactory.java index 2da052d5c3..ae529aa77b 100644 --- a/src/main/java/com/google/gerrit/server/rpc/patch/CommentDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/CommentDetailFactory.java @@ -12,22 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.patch; +package com.google.gerrit.httpd.rpc.patch; -import com.google.gerrit.client.patches.CommentDetail; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.common.data.CommentDetail; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountInfoCacheFactory; import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/patch/PatchDetailServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java similarity index 92% rename from src/main/java/com/google/gerrit/server/rpc/patch/PatchDetailServiceImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java index 087a97a54a..fb65e2a165 100644 --- a/src/main/java/com/google/gerrit/server/rpc/patch/PatchDetailServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java @@ -12,31 +12,31 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.patch; +package com.google.gerrit.httpd.rpc.patch; -import com.google.gerrit.client.data.ApprovalSummary; -import com.google.gerrit.client.data.ApprovalSummarySet; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.data.PatchScript; -import com.google.gerrit.client.data.PatchScriptSettings; -import com.google.gerrit.client.patches.AddReviewerResult; -import com.google.gerrit.client.patches.CommentDetail; -import com.google.gerrit.client.patches.PatchDetailService; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountPatchReview; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeMessage; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.Patch.Key; -import com.google.gerrit.client.rpc.NoSuchEntityException; -import com.google.gerrit.server.BaseServiceImplementation; +import com.google.gerrit.common.data.AddReviewerResult; +import com.google.gerrit.common.data.ApprovalSummary; +import com.google.gerrit.common.data.ApprovalSummarySet; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.CommentDetail; +import com.google.gerrit.common.data.PatchDetailService; +import com.google.gerrit.common.data.PatchScript; +import com.google.gerrit.common.data.PatchScriptSettings; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.httpd.rpc.BaseServiceImplementation; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountPatchReview; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Patch.Key; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountInfoCacheFactory; diff --git a/src/main/java/com/google/gerrit/server/rpc/patch/PatchModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchModule.java similarity index 88% rename from src/main/java/com/google/gerrit/server/rpc/patch/PatchModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchModule.java index 159ac20987..0b58702561 100644 --- a/src/main/java/com/google/gerrit/server/rpc/patch/PatchModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchModule.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.patch; +package com.google.gerrit.httpd.rpc.patch; +import com.google.gerrit.httpd.rpc.RpcServletModule; +import com.google.gerrit.httpd.rpc.UiRpcModule; import com.google.gerrit.server.config.FactoryModule; -import com.google.gerrit.server.http.RpcServletModule; -import com.google.gerrit.server.rpc.UiRpcModule; public class PatchModule extends RpcServletModule { public PatchModule() { diff --git a/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptBuilder.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java similarity index 95% rename from src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptBuilder.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java index 6ddc84648e..673ef0faa4 100644 --- a/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptBuilder.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.patch; +package com.google.gerrit.httpd.rpc.patch; -import com.google.gerrit.client.data.EditList; -import com.google.gerrit.client.data.PatchScript; -import com.google.gerrit.client.data.PatchScriptSettings; -import com.google.gerrit.client.data.SparseFileContent; -import com.google.gerrit.client.data.PatchScript.DisplayMethod; -import com.google.gerrit.client.patches.CommentDetail; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.Patch.PatchType; +import com.google.gerrit.common.data.CommentDetail; +import com.google.gerrit.common.data.EditList; +import com.google.gerrit.common.data.PatchScript; +import com.google.gerrit.common.data.PatchScriptSettings; +import com.google.gerrit.common.data.SparseFileContent; +import com.google.gerrit.common.data.PatchScript.DisplayMethod; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.Patch.PatchType; import com.google.gerrit.server.FileTypeRegistry; import com.google.gerrit.server.patch.PatchListEntry; import com.google.gerrit.server.patch.Text; diff --git a/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptFactory.java similarity index 90% rename from src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptFactory.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptFactory.java index 1b947b50a0..24b17cac11 100644 --- a/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptFactory.java @@ -12,30 +12,30 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.patch; +package com.google.gerrit.httpd.rpc.patch; -import com.google.gerrit.client.data.PatchScript; -import com.google.gerrit.client.data.PatchScriptSettings; -import com.google.gerrit.client.data.PatchScriptSettings.Whitespace; -import com.google.gerrit.client.patches.CommentDetail; -import com.google.gerrit.client.reviewdb.AccountGeneralPreferences; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.git.GitRepositoryManager; +import com.google.gerrit.common.data.CommentDetail; +import com.google.gerrit.common.data.PatchScript; +import com.google.gerrit.common.data.PatchScriptSettings; +import com.google.gerrit.common.data.PatchScriptSettings.Whitespace; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.AccountGeneralPreferences; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.FileTypeRegistry; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.Nullable; +import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.patch.PatchListEntry; import com.google.gerrit.server.patch.PatchListKey; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/patch/SaveDraft.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/SaveDraft.java similarity index 89% rename from src/main/java/com/google/gerrit/server/rpc/patch/SaveDraft.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/SaveDraft.java index c98904ddd7..1fbc559416 100644 --- a/src/main/java/com/google/gerrit/server/rpc/patch/SaveDraft.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/SaveDraft.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.patch; +package com.google.gerrit.httpd.rpc.patch; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/project/AddBranch.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/AddBranch.java similarity index 93% rename from src/main/java/com/google/gerrit/server/rpc/project/AddBranch.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/AddBranch.java index f9622d63a3..a368706d6e 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/AddBranch.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/AddBranch.java @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.project; +package com.google.gerrit.httpd.rpc.project; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.rpc.InvalidNameException; -import com.google.gerrit.client.rpc.InvalidRevisionException; -import com.google.gerrit.git.GitRepositoryManager; -import com.google.gerrit.git.ReplicationQueue; +import com.google.gerrit.common.errors.InvalidNameException; +import com.google.gerrit.common.errors.InvalidRevisionException; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Project; import com.google.gerrit.server.IdentifiedUser; +import com.google.gerrit.server.git.GitRepositoryManager; +import com.google.gerrit.server.git.ReplicationQueue; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.rpc.Handler; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/project/AddProjectRight.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/AddProjectRight.java similarity index 89% rename from src/main/java/com/google/gerrit/server/rpc/project/AddProjectRight.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/AddProjectRight.java index debe3504cc..362eb11197 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/AddProjectRight.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/AddProjectRight.java @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.project; +package com.google.gerrit.httpd.rpc.project; -import com.google.gerrit.client.admin.ProjectDetail; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.ProjectDetail; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.account.NoSuchGroupException; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/project/ChangeProjectSettings.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectSettings.java similarity index 89% rename from src/main/java/com/google/gerrit/server/rpc/project/ChangeProjectSettings.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectSettings.java index c747739f57..8831e9071d 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/ChangeProjectSettings.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectSettings.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.project; +package com.google.gerrit.httpd.rpc.project; -import com.google.gerrit.client.admin.ProjectDetail; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.git.GitRepositoryManager; +import com.google.gerrit.common.data.ProjectDetail; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/project/DeleteBranches.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/DeleteBranches.java similarity index 92% rename from src/main/java/com/google/gerrit/server/rpc/project/DeleteBranches.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/DeleteBranches.java index 5f47bb95d1..526afe528c 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/DeleteBranches.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/DeleteBranches.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.project; +package com.google.gerrit.httpd.rpc.project; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.git.GitRepositoryManager; -import com.google.gerrit.git.ReplicationQueue; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.server.git.GitRepositoryManager; +import com.google.gerrit.server.git.ReplicationQueue; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.rpc.Handler; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/project/DeleteProjectRights.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/DeleteProjectRights.java similarity index 91% rename from src/main/java/com/google/gerrit/server/rpc/project/DeleteProjectRights.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/DeleteProjectRights.java index 3cd398dbae..d476d8926e 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/DeleteProjectRights.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/DeleteProjectRights.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.project; +package com.google.gerrit.httpd.rpc.project; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtjsonrpc.client.VoidResult; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/rpc/project/ListBranches.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ListBranches.java similarity index 92% rename from src/main/java/com/google/gerrit/server/rpc/project/ListBranches.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ListBranches.java index 4dc12856c5..c8c4409cb4 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/ListBranches.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ListBranches.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.project; +package com.google.gerrit.httpd.rpc.project; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.RevId; -import com.google.gerrit.git.GitRepositoryManager; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.RevId; +import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.rpc.Handler; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/project/OwnedProjects.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/OwnedProjects.java similarity index 87% rename from src/main/java/com/google/gerrit/server/rpc/project/OwnedProjects.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/OwnedProjects.java index 573e090c41..4e7267f00f 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/OwnedProjects.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/OwnedProjects.java @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.project; +package com.google.gerrit.httpd.rpc.project; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.rpc.Handler; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/rpc/project/ProjectAdminServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java similarity index 91% rename from src/main/java/com/google/gerrit/server/rpc/project/ProjectAdminServiceImpl.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java index c095be83a6..7a9ba03a33 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/ProjectAdminServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.project; +package com.google.gerrit.httpd.rpc.project; -import com.google.gerrit.client.admin.ProjectAdminService; -import com.google.gerrit.client.admin.ProjectDetail; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; +import com.google.gerrit.common.data.ProjectAdminService; +import com.google.gerrit.common.data.ProjectDetail; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwtjsonrpc.client.VoidResult; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/rpc/project/ProjectDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectDetailFactory.java similarity index 90% rename from src/main/java/com/google/gerrit/server/rpc/project/ProjectDetailFactory.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectDetailFactory.java index 7c5f00fd68..7106f32283 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/ProjectDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectDetailFactory.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.project; +package com.google.gerrit.httpd.rpc.project; -import com.google.gerrit.client.admin.ProjectDetail; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.ProjectDetail; +import com.google.gerrit.httpd.rpc.Handler; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.project.ProjectState; -import com.google.gerrit.server.rpc.Handler; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/rpc/project/ProjectModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectModule.java similarity index 90% rename from src/main/java/com/google/gerrit/server/rpc/project/ProjectModule.java rename to gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectModule.java index 3cfc35fe8a..34de2fd666 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/ProjectModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectModule.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.rpc.project; +package com.google.gerrit.httpd.rpc.project; +import com.google.gerrit.httpd.rpc.RpcServletModule; +import com.google.gerrit.httpd.rpc.UiRpcModule; import com.google.gerrit.server.config.FactoryModule; -import com.google.gerrit.server.http.RpcServletModule; -import com.google.gerrit.server.rpc.UiRpcModule; public class ProjectModule extends RpcServletModule { public ProjectModule() { diff --git a/gerrit-main/.gitignore b/gerrit-main/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-main/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-main/.settings/org.eclipse.core.resources.prefs b/gerrit-main/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-main/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-main/.settings/org.eclipse.core.runtime.prefs b/gerrit-main/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-main/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-main/.settings/org.eclipse.jdt.core.prefs b/gerrit-main/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-main/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-main/.settings/org.eclipse.jdt.ui.prefs b/gerrit-main/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-main/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-main/pom.xml b/gerrit-main/pom.xml new file mode 100644 index 0000000000..9707789561 --- /dev/null +++ b/gerrit-main/pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-main + Gerrit Code Review - Main + + + Main class to bootstrap out of a WAR + + diff --git a/gerrit-main/src/main/java/Main.java b/gerrit-main/src/main/java/Main.java new file mode 100644 index 0000000000..087a8e3a64 --- /dev/null +++ b/gerrit-main/src/main/java/Main.java @@ -0,0 +1,29 @@ +// Copyright (C) 2009 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +public final class Main { + // We don't do any real work here because we need to import + // the archive lookup code and we cannot import a class in + // the default package. So this is just a tiny springboard + // to jump into the real main code. + // + + public static void main(final String argv[]) throws Exception { + com.google.gerrit.main.GerritLauncher.main(argv); + } + + private Main() { + } +} diff --git a/gerrit-main/src/main/java/com/google/gerrit/main/GerritLauncher.java b/gerrit-main/src/main/java/com/google/gerrit/main/GerritLauncher.java new file mode 100644 index 0000000000..870b185e30 --- /dev/null +++ b/gerrit-main/src/main/java/com/google/gerrit/main/GerritLauncher.java @@ -0,0 +1,441 @@ +package com.google.gerrit.main; + +// Copyright (C) 2009 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.JarURLConnection; +import java.net.URL; +import java.net.URLClassLoader; +import java.security.CodeSource; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.jar.Attributes; +import java.util.jar.JarFile; +import java.util.jar.Manifest; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + +/** Main class for a JAR file to run code from "WEB-INF/lib". */ +public final class GerritLauncher { + private static final String pkg = "com.google.gerrit.pgm"; + private static final String NOT_ARCHIVED = "NOT_ARCHIVED"; + + public static void main(final String argv[]) throws Exception { + if (argv.length == 0) { + File me; + try { + me = getDistributionArchive(); + } catch (FileNotFoundException e) { + me = null; + } + + String jar = me != null ? me.getName() : "gerrit.war"; + System.err.println("Gerrit Code Review " + getVersion(me)); + System.err.println("usage: java -jar " + jar + " command [ARG ...]"); + System.err.println(); + System.err.println("The most commonly used commands are:"); + System.err.println(" daemon Run the internal SSH daemon"); + System.err.println(" version Display the build version number"); + System.err.println(); + System.err.println(" ls List files available for cat"); + System.err.println(" cat FILE Display a file from the archive"); + System.err.println(); + System.exit(1); + } + + if ("-v".equals(argv[0]) || "--version".equals(argv[0])) { + // Special case, jump into the "Version" command which is + // compiled somewhere in our library packages. + // + argv[0] = "Version"; + } + + final String cmd = argv[0]; + if ("cat".equals(cmd) || "-p".equals(cmd) || "--cat".equals(cmd)) { + // Copy the contents of a file to System.out + // + if (argv.length == 2) { + cat(argv[1]); + } else { + System.err.println("usage: cat FILE"); + System.exit(1); + } + + } else if ("ls".equals(cmd) || "-l".equals(cmd) || "--ls".equals(cmd)) { + // List the available files under WEB-INF/ + // + if (argv.length == 1) { + ls(); + } else { + System.err.println("usage: ls"); + System.exit(1); + } + + } else { + // Run an arbitrary application class + // + final ClassLoader cl = libClassLoader(); + Thread.currentThread().setContextClassLoader(cl); + runMain(cl, argv); + } + } + + private static String getVersion(final File me) { + if (me == null) { + return ""; + } + + try { + final JarFile jar = new JarFile(me); + try { + Manifest mf = jar.getManifest(); + Attributes att = mf.getMainAttributes(); + String val = att.getValue(Attributes.Name.IMPLEMENTATION_VERSION); + return val != null ? val : ""; + } finally { + jar.close(); + } + } catch (IOException e) { + return ""; + } + } + + private static void cat(String fileName) throws IOException { + while (fileName.startsWith("/")) { + fileName = fileName.substring(1); + } + + String name; + if (fileName.equals("LICENSES.txt")) { + name = fileName; + } else { + name = "WEB-INF/" + fileName; + } + + final InputStream in = GerritLauncher.class.getResourceAsStream(name); + if (in == null) { + System.err.println("error: no such file " + fileName); + System.exit(1); + } + + try { + try { + final byte[] buf = new byte[4096]; + int n; + while ((n = in.read(buf)) >= 0) { + System.out.write(buf, 0, n); + } + } finally { + System.out.flush(); + } + } finally { + in.close(); + } + } + + private static void ls() throws IOException { + final ZipFile zf = new ZipFile(getDistributionArchive()); + try { + final Enumeration e = zf.entries(); + while (e.hasMoreElements()) { + final ZipEntry ze = e.nextElement(); + String name = ze.getName(); + boolean show = false; + show |= name.startsWith("WEB-INF/"); + show |= name.equals("LICENSES.txt"); + + show &= !ze.isDirectory(); + show &= !name.startsWith("WEB-INF/classes/"); + show &= !name.startsWith("WEB-INF/lib/"); + show &= !name.equals("WEB-INF/web.xml"); + if (show) { + if (name.startsWith("WEB-INF/")) { + name = name.substring("WEB-INF/".length()); + } + System.out.println(name); + } + } + } finally { + zf.close(); + } + } + + private static void runMain(final ClassLoader loader, final String[] origArgv) + throws Exception { + String name = origArgv[0]; + final String[] argv = new String[origArgv.length - 1]; + System.arraycopy(origArgv, 1, argv, 0, argv.length); + + Class clazz; + try { + try { + clazz = Class.forName(pkg + "." + name, true, loader); + } catch (ClassNotFoundException cnfe) { + if (name.equals(name.toLowerCase())) { + String first = name.substring(0, 1).toUpperCase(); + String cn = first + name.substring(1); + clazz = Class.forName(pkg + "." + cn, true, loader); + } else { + throw cnfe; + } + } + } catch (ClassNotFoundException cnfe) { + System.err.println("fatal: unknown command " + name); + System.err.println(" (no " + pkg + "." + name + ")"); + System.exit(1); + return; + } + + final Method main; + try { + main = clazz.getMethod("main", argv.getClass()); + } catch (SecurityException e) { + System.err.println("fatal: unknown command " + name); + System.exit(1); + return; + } catch (NoSuchMethodException e) { + System.err.println("fatal: unknown command " + name); + System.exit(1); + return; + } + + final Object res; + if ((main.getModifiers() & Modifier.STATIC) == Modifier.STATIC) { + res = main.invoke(null, new Object[] {argv}); + } else { + res = main.invoke(clazz.newInstance(), new Object[] {argv}); + } + if (res instanceof Number) { + System.exit(((Number) res).intValue()); + } else { + System.exit(0); + } + } + + private static ClassLoader libClassLoader() throws IOException { + final File path; + try { + path = getDistributionArchive(); + } catch (FileNotFoundException e) { + if (NOT_ARCHIVED == e.getMessage()) { + // Assume the CLASSPATH was made complete by the calling process, + // as we are likely being run from within a developer's IDE. + // + return GerritLauncher.class.getClassLoader(); + } + throw e; + } + + final ArrayList jars = new ArrayList(); + try { + final ZipFile zf = new ZipFile(path); + try { + final Enumeration e = zf.entries(); + while (e.hasMoreElements()) { + final ZipEntry ze = e.nextElement(); + if (ze.isDirectory()) { + continue; + } + + if (ze.getName().startsWith("WEB-INF/lib/")) { + final File tmp = createTempFile(safeName(ze), ".jar"); + final FileOutputStream out = new FileOutputStream(tmp); + try { + final InputStream in = zf.getInputStream(ze); + try { + final byte[] buf = new byte[4096]; + int n; + while ((n = in.read(buf, 0, buf.length)) > 0) { + out.write(buf, 0, n); + } + } finally { + in.close(); + } + } finally { + out.close(); + } + jars.add(tmp.toURI().toURL()); + } + } + } finally { + zf.close(); + } + } catch (IOException e) { + throw new IOException("Cannot obtain libraries from " + path, e); + } + + if (jars.isEmpty()) { + return GerritLauncher.class.getClassLoader(); + } + return new URLClassLoader(jars.toArray(new URL[jars.size()])); + } + + private static String safeName(final ZipEntry ze) { + // Try to derive the name of the temporary file so it + // doesn't completely suck. Best if we can make it + // match the name it was in the archive. + // + String name = ze.getName(); + if (0 <= name.lastIndexOf('/')) { + name = name.substring(name.lastIndexOf('/') + 1); + } + if (0 <= name.lastIndexOf('.')) { + name = name.substring(0, name.lastIndexOf('.')); + } + if (name.isEmpty()) { + name = "code"; + } + return name; + } + + private static File myArchive; + + /** + * Locate the JAR/WAR file we were launched from. + * + * @return local path of the Gerrit WAR file. + * @throws FileNotFoundException if the code cannot guess the location. + */ + public static File getDistributionArchive() throws FileNotFoundException { + if (myArchive == null) { + myArchive = locateMyArchive(); + } + return myArchive; + } + + private static File locateMyArchive() throws FileNotFoundException { + final ClassLoader myCL = GerritLauncher.class.getClassLoader(); + final String myName = + GerritLauncher.class.getName().replace('.', '/') + ".class"; + + final URL myClazz = myCL.getResource(myName); + if (myClazz == null) { + throw new FileNotFoundException("Cannot find JAR: no " + myName); + } + + // ZipFile may have the path of our JAR hiding within itself. + // + try { + Field nameField = ZipFile.class.getDeclaredField("name"); + nameField.setAccessible(true); + + JarFile jar = ((JarURLConnection) myClazz.openConnection()).getJarFile(); + File path = new File((String) nameField.get(jar)); + if (path.isFile()) { + return path; + } + } catch (Exception e) { + // Nope, that didn't work. Try a different method. + // + } + + // Maybe this is a local class file, running under a debugger? + // + if ("file".equals(myClazz.getProtocol())) { + final File path = new File(myClazz.getPath()); + if (path.isFile() && path.getParentFile().isDirectory()) { + throw new FileNotFoundException(NOT_ARCHIVED); + } + } + + // The CodeSource might be able to give us the source as a stream. + // If so, copy it to a local file so we have random access to it. + // + final CodeSource src = + GerritLauncher.class.getProtectionDomain().getCodeSource(); + if (src != null) { + try { + final InputStream in = src.getLocation().openStream(); + try { + final File tmp = createTempFile("gerrit_", ".zip"); + final FileOutputStream out = new FileOutputStream(tmp); + try { + final byte[] buf = new byte[4096]; + int n; + while ((n = in.read(buf, 0, buf.length)) > 0) { + out.write(buf, 0, n); + } + } finally { + out.close(); + } + return tmp; + } finally { + in.close(); + } + } catch (IOException e) { + // Nope, that didn't work. + // + } + } + + throw new FileNotFoundException("Cannot find local copy of JAR"); + } + + private static boolean temporaryDirectoryFound; + private static File temporaryDirectory; + + private static File createTempFile(String prefix, String suffix) + throws IOException { + if (!temporaryDirectoryFound) { + final File d = File.createTempFile("gerrit_", "_app"); + if (d.delete() && d.mkdir()) { + // Try to lock the directory down to be accessible by us. + // We first have to remove all permissions, then add back + // only the owner permissions. + // + d.setWritable(false, false /* all */); + d.setReadable(false, false /* all */); + d.setExecutable(false, false /* all */); + + d.setWritable(true, true /* owner only */); + d.setReadable(true, true /* owner only */); + d.setExecutable(true, true /* owner only */); + + d.deleteOnExit(); + temporaryDirectory = d; + } + temporaryDirectoryFound = true; + } + + if (temporaryDirectory != null) { + // If we have a private directory and this name has not yet + // been used within the private directory, create it as-is. + // + final File tmp = new File(temporaryDirectory, prefix + suffix); + if (tmp.createNewFile()) { + tmp.deleteOnExit(); + return tmp; + } + } + + if (!prefix.endsWith("_")) { + prefix += "_"; + } + + final File tmp = File.createTempFile(prefix, suffix, temporaryDirectory); + tmp.deleteOnExit(); + return tmp; + } + + private GerritLauncher() { + } +} diff --git a/gerrit-patch-commonsnet/.gitignore b/gerrit-patch-commonsnet/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-patch-commonsnet/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-patch-commonsnet/.settings/org.eclipse.core.resources.prefs b/gerrit-patch-commonsnet/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-patch-commonsnet/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-patch-commonsnet/.settings/org.eclipse.core.runtime.prefs b/gerrit-patch-commonsnet/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-patch-commonsnet/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-patch-commonsnet/.settings/org.eclipse.jdt.core.prefs b/gerrit-patch-commonsnet/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-patch-commonsnet/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-patch-commonsnet/.settings/org.eclipse.jdt.ui.prefs b/gerrit-patch-commonsnet/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-patch-commonsnet/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-patch-commonsnet/pom.xml b/gerrit-patch-commonsnet/pom.xml new file mode 100644 index 0000000000..c9e08aeee3 --- /dev/null +++ b/gerrit-patch-commonsnet/pom.xml @@ -0,0 +1,56 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-patch-commonsnet + Gerrit Code Review - Patch commons-net + + + Hacks to expose package-private data from commons-net to Gerrit + + + + + commons-net + commons-net + + + + commons-codec + commons-codec + + + + org.slf4j + slf4j-api + + + + com.google.gerrit + gerrit-util-ssl + + + diff --git a/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java b/gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java similarity index 84% rename from src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java rename to gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java index 30eecd63b6..e380df431e 100644 --- a/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java +++ b/gerrit-patch-commonsnet/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java @@ -14,9 +14,9 @@ package org.apache.commons.net.smtp; -import com.google.gerrit.server.ioutil.BlindSSLSocketFactory; +import com.google.gerrit.util.ssl.BlindSSLSocketFactory; -import org.eclipse.jgit.util.Base64; +import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,8 +35,8 @@ import javax.crypto.spec.SecretKeySpec; import javax.net.ssl.SSLSocketFactory; public class AuthSMTPClient extends SMTPClient { - private static final Logger log = - LoggerFactory.getLogger(AuthSMTPClient.class); + private static final Logger log = LoggerFactory.getLogger(AuthSMTPClient.class); + private static final String UTF_8 = "UTF-8"; private String authTypes; private Set allowedRcptTo; @@ -49,8 +49,8 @@ public class AuthSMTPClient extends SMTPClient { _socketFactory_ = sslFactory(verify); } - public boolean startTLS(final String hostname, final int port, - final boolean verify) throws SocketException, IOException { + public boolean startTLS(final String hostname, final int port, final boolean verify) + throws SocketException, IOException { if (sendCommand("STARTTLS") != 220) { return false; } @@ -122,8 +122,7 @@ public class AuthSMTPClient extends SMTPClient { boolean ok = SMTPReply.isPositiveCompletion(sendCommand("EHLO", name)); authTypes = ""; for (String line : getReplyStrings()) { - if (line != null - && (line.startsWith("250 AUTH ") || line.startsWith("250-AUTH "))) { + if (line != null && (line.startsWith("250 AUTH ") || line.startsWith("250-AUTH "))) { authTypes = line; break; } @@ -163,11 +162,12 @@ public class AuthSMTPClient extends SMTPClient { return false; } - final byte[] nonce = Base64.decode(getReplyStrings()[0].split(" ", 2)[1]); + final String enc = getReplyStrings()[0].split(" ", 2)[1]; + final byte[] nonce = Base64.decodeBase64(enc.getBytes(UTF_8)); final String sec; try { Mac mac = Mac.getInstance(macName); - mac.init(new SecretKeySpec(smtpPass.getBytes("UTF-8"), macName)); + mac.init(new SecretKeySpec(smtpPass.getBytes(UTF_8), macName)); sec = toHex(mac.doFinal(nonce)); } catch (NoSuchAlgorithmException e) { throw new IOException("Cannot use CRAM-" + alg, e); @@ -176,13 +176,12 @@ public class AuthSMTPClient extends SMTPClient { } String token = smtpUser + ' ' + sec; - String cmd = Base64.encodeBytes(token.getBytes("UTF-8")); + String cmd = encodeBase64(token.getBytes(UTF_8)); return SMTPReply.isPositiveCompletion(sendCommand(cmd)); } private static final char[] hexchar = - {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', - 'e', 'f'}; + {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; private String toHex(final byte[] b) { final StringBuilder sec = new StringBuilder(); @@ -195,10 +194,14 @@ public class AuthSMTPClient extends SMTPClient { return sec.toString(); } - private boolean authPlain(String smtpUser, String smtpPass) - throws UnsupportedEncodingException, IOException { + private boolean authPlain(String smtpUser, String smtpPass) throws UnsupportedEncodingException, + IOException { String token = '\0' + smtpUser + '\0' + smtpPass; - String cmd = "PLAIN " + Base64.encodeBytes(token.getBytes("UTF-8")); + String cmd = "PLAIN " + encodeBase64(token.getBytes(UTF_8)); return SMTPReply.isPositiveCompletion(sendCommand("AUTH", cmd)); } + + private static String encodeBase64(final byte[] data) throws UnsupportedEncodingException { + return new String(Base64.encodeBase64(data), UTF_8); + } } diff --git a/gerrit-patch-gwtexpui/.gitignore b/gerrit-patch-gwtexpui/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-patch-gwtexpui/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-patch-gwtexpui/.settings/org.eclipse.core.resources.prefs b/gerrit-patch-gwtexpui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-patch-gwtexpui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-patch-gwtexpui/.settings/org.eclipse.core.runtime.prefs b/gerrit-patch-gwtexpui/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-patch-gwtexpui/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-patch-gwtexpui/.settings/org.eclipse.jdt.core.prefs b/gerrit-patch-gwtexpui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-patch-gwtexpui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-patch-gwtexpui/.settings/org.eclipse.jdt.ui.prefs b/gerrit-patch-gwtexpui/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-patch-gwtexpui/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-patch-gwtexpui/pom.xml b/gerrit-patch-gwtexpui/pom.xml new file mode 100644 index 0000000000..f738ac8913 --- /dev/null +++ b/gerrit-patch-gwtexpui/pom.xml @@ -0,0 +1,47 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-patch-gwtexpui + Gerrit Code Review - Patch gwtexpui + + + Hacks to expose package-private data from gwtexpui to Gerrit + + + + + gwtexpui + gwtexpui + + + + com.google.gwt + gwt-user + provided + + + diff --git a/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/PrettyFormatter.gwt.xml b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/PrettyFormatter.gwt.xml new file mode 100644 index 0000000000..b0679c3285 --- /dev/null +++ b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/PrettyFormatter.gwt.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/src/main/java/com/google/gwtexpui/safehtml/client/MultiLineStyle.java b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/MultiLineStyle.java similarity index 100% rename from src/main/java/com/google/gwtexpui/safehtml/client/MultiLineStyle.java rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/MultiLineStyle.java diff --git a/src/main/java/com/google/gwtexpui/safehtml/client/PrettyFormatter.java b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/PrettyFormatter.java similarity index 100% rename from src/main/java/com/google/gwtexpui/safehtml/client/PrettyFormatter.java rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/client/PrettyFormatter.java diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/lang-css.js b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-css.js similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/lang-css.js rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-css.js diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/lang-hs.js b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-hs.js similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/lang-hs.js rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-hs.js diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/lang-lisp.js b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-lisp.js similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/lang-lisp.js rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-lisp.js diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/lang-lua.js b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-lua.js similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/lang-lua.js rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-lua.js diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/lang-ml.js b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-ml.js similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/lang-ml.js rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-ml.js diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/lang-proto.js b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-proto.js similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/lang-proto.js rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-proto.js diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/lang-sql.js b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-sql.js similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/lang-sql.js rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-sql.js diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/lang-vb.js b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-vb.js similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/lang-vb.js rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-vb.js diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/lang-wiki.js b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-wiki.js similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/lang-wiki.js rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/lang-wiki.js diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/prettify.css b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/prettify.css similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/prettify.css rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/prettify.css diff --git a/src/main/java/com/google/gerrit/public/prettify20090521/prettify.js b/gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/prettify.js similarity index 100% rename from src/main/java/com/google/gerrit/public/prettify20090521/prettify.js rename to gerrit-patch-gwtexpui/src/main/java/com/google/gwtexpui/safehtml/public/prettify20090521/prettify.js diff --git a/gerrit-patch-jgit/.gitignore b/gerrit-patch-jgit/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-patch-jgit/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-patch-jgit/.settings/org.eclipse.core.resources.prefs b/gerrit-patch-jgit/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-patch-jgit/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-patch-jgit/.settings/org.eclipse.core.runtime.prefs b/gerrit-patch-jgit/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-patch-jgit/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-patch-jgit/.settings/org.eclipse.jdt.core.prefs b/gerrit-patch-jgit/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-patch-jgit/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-patch-jgit/.settings/org.eclipse.jdt.ui.prefs b/gerrit-patch-jgit/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-patch-jgit/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-patch-jgit/pom.xml b/gerrit-patch-jgit/pom.xml new file mode 100644 index 0000000000..76878e03fa --- /dev/null +++ b/gerrit-patch-jgit/pom.xml @@ -0,0 +1,52 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-patch-jgit + Gerrit Code Review - Patch JGit + + + Hacks to expose package-private data from JGit to Gerrit + + + + + org.eclipse + jgit + + + + gwtjsonrpc + gwtjsonrpc + + + + com.google.gwt + gwt-user + provided + + + diff --git a/src/main/java/org/eclipse/jgit/JGit.gwt.xml b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/JGit.gwt.xml similarity index 100% rename from src/main/java/org/eclipse/jgit/JGit.gwt.xml rename to gerrit-patch-jgit/src/main/java/org/eclipse/jgit/JGit.gwt.xml diff --git a/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java similarity index 100% rename from src/main/java/org/eclipse/jgit/diff/EditDeserializer.java rename to gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java diff --git a/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java similarity index 100% rename from src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java rename to gerrit-patch-jgit/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java diff --git a/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java similarity index 64% rename from src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java rename to gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java index 9d001c3cea..68a0fd4309 100644 --- a/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java +++ b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java @@ -14,10 +14,7 @@ package org.eclipse.jgit.lib; -import static com.google.gerrit.server.ioutil.BasicSerialization.readFixInt32; -import static com.google.gerrit.server.ioutil.BasicSerialization.readVarInt32; -import static com.google.gerrit.server.ioutil.BasicSerialization.writeFixInt32; -import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32; +import org.eclipse.jgit.util.NB; import java.io.IOException; import java.io.InputStream; @@ -27,24 +24,20 @@ public class ObjectIdSerialization { public static void writeCanBeNull(final OutputStream out, final AnyObjectId id) throws IOException { if (id != null) { - writeVarInt32(out, 1); + out.write((byte)1); writeNotNull(out, id); } else { - writeVarInt32(out, 0); + out.write((byte)0); } } public static void writeNotNull(final OutputStream out, final AnyObjectId id) throws IOException { - writeFixInt32(out, id.w1); - writeFixInt32(out, id.w2); - writeFixInt32(out, id.w3); - writeFixInt32(out, id.w4); - writeFixInt32(out, id.w5); + id.copyRawTo(out); } public static ObjectId readCanBeNull(final InputStream in) throws IOException { - switch (readVarInt32(in)) { + switch (in.read()) { case 0: return null; case 1: @@ -55,12 +48,9 @@ public class ObjectIdSerialization { } public static ObjectId readNotNull(final InputStream in) throws IOException { - final int w1 = readFixInt32(in); - final int w2 = readFixInt32(in); - final int w3 = readFixInt32(in); - final int w4 = readFixInt32(in); - final int w5 = readFixInt32(in); - return new ObjectId(w1, w2, w3, w4, w5); + final byte[] b = new byte[20]; + NB.readFully(in, b, 0, 20); + return ObjectId.fromRaw(b); } private ObjectIdSerialization() { diff --git a/src/main/java/org/eclipse/jgit/lib/WindowCacheStatAccessor.java b/gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/WindowCacheStatAccessor.java similarity index 100% rename from src/main/java/org/eclipse/jgit/lib/WindowCacheStatAccessor.java rename to gerrit-patch-jgit/src/main/java/org/eclipse/jgit/lib/WindowCacheStatAccessor.java diff --git a/gerrit-pgm/.gitignore b/gerrit-pgm/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-pgm/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-pgm/.settings/org.eclipse.core.resources.prefs b/gerrit-pgm/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-pgm/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-pgm/.settings/org.eclipse.core.runtime.prefs b/gerrit-pgm/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-pgm/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-pgm/.settings/org.eclipse.jdt.core.prefs b/gerrit-pgm/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-pgm/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-pgm/.settings/org.eclipse.jdt.ui.prefs b/gerrit-pgm/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-pgm/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-pgm/pom.xml b/gerrit-pgm/pom.xml new file mode 100644 index 0000000000..485de55135 --- /dev/null +++ b/gerrit-pgm/pom.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-pgm + Gerrit Code Review - Pgm + + + Command line executables + + + + + com.google.gerrit + gerrit-util-cli + + + + com.google.gerrit + gerrit-server + + + + com.google.gerrit + gerrit-sshd + + + diff --git a/src/main/java/com/google/gerrit/pgm/AbstractProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/AbstractProgram.java similarity index 98% rename from src/main/java/com/google/gerrit/pgm/AbstractProgram.java rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/AbstractProgram.java index e358a1054b..4ec9756256 100644 --- a/src/main/java/com/google/gerrit/pgm/AbstractProgram.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/AbstractProgram.java @@ -15,6 +15,7 @@ package com.google.gerrit.pgm; +import com.google.gerrit.util.cli.CmdLineParser; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; diff --git a/src/main/java/com/google/gerrit/pgm/CreateSchema.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/CreateSchema.java similarity index 92% rename from src/main/java/com/google/gerrit/pgm/CreateSchema.java rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/CreateSchema.java index 1f31722892..ea2604963b 100644 --- a/src/main/java/com/google/gerrit/pgm/CreateSchema.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/CreateSchema.java @@ -16,9 +16,9 @@ package com.google.gerrit.pgm; import static com.google.inject.Stage.PRODUCTION; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.SchemaVersion; -import com.google.gerrit.client.reviewdb.SystemConfig; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.SchemaVersion; +import com.google.gerrit.reviewdb.SystemConfig; import com.google.gerrit.server.config.DatabaseModule; import com.google.gwtorm.client.SchemaFactory; import com.google.inject.Guice; diff --git a/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java similarity index 88% rename from src/main/java/com/google/gerrit/pgm/Daemon.java rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java index 473c3a1f06..558a1b1071 100644 --- a/src/main/java/com/google/gerrit/pgm/Daemon.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java @@ -16,10 +16,10 @@ package com.google.gerrit.pgm; import com.google.gerrit.server.cache.CachePool; import com.google.gerrit.server.config.GerritGlobalModule; -import com.google.gerrit.server.ssh.SshDaemon; -import com.google.gerrit.server.ssh.SshModule; -import com.google.gerrit.server.ssh.commands.MasterCommandModule; -import com.google.gerrit.server.ssh.commands.SlaveCommandModule; +import com.google.gerrit.sshd.SshDaemon; +import com.google.gerrit.sshd.SshModule; +import com.google.gerrit.sshd.commands.MasterCommandModule; +import com.google.gerrit.sshd.commands.SlaveCommandModule; import com.google.inject.Injector; import com.google.inject.Module; diff --git a/src/main/java/com/google/gerrit/pgm/Version.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Version.java similarity index 54% rename from src/main/java/com/google/gerrit/pgm/Version.java rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/Version.java index 6c48680c42..3bf9cf8605 100644 --- a/src/main/java/com/google/gerrit/pgm/Version.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Version.java @@ -14,44 +14,11 @@ package com.google.gerrit.pgm; -import com.google.gerrit.client.GerritVersion; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - - /** Display the version of Gerrit. */ public class Version extends AbstractProgram { - private static String version; - - public static synchronized String getVersion() { - if (version == null) { - final Properties p = new Properties(); - final InputStream in = - GerritVersion.class.getResourceAsStream(GerritVersion.class - .getSimpleName() - + ".properties"); - if (in == null) { - return null; - } - try { - try { - p.load(in); - } finally { - in.close(); - } - version = p.getProperty("version"); - } catch (IOException e) { - return null; - } - } - return version; - } - @Override public int run() throws Exception { - final String v = getVersion(); + final String v = com.google.gerrit.common.Version.getVersion(); if (v == null) { System.err.println("fatal: version unavailable"); return 1; diff --git a/gerrit-reviewdb/.gitignore b/gerrit-reviewdb/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-reviewdb/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-reviewdb/.settings/org.eclipse.core.resources.prefs b/gerrit-reviewdb/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-reviewdb/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-reviewdb/.settings/org.eclipse.core.runtime.prefs b/gerrit-reviewdb/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-reviewdb/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-reviewdb/.settings/org.eclipse.jdt.core.prefs b/gerrit-reviewdb/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-reviewdb/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-reviewdb/.settings/org.eclipse.jdt.ui.prefs b/gerrit-reviewdb/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-reviewdb/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-reviewdb/pom.xml b/gerrit-reviewdb/pom.xml new file mode 100644 index 0000000000..638d86e45c --- /dev/null +++ b/gerrit-reviewdb/pom.xml @@ -0,0 +1,41 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-reviewdb + Gerrit Code Review - ReviewDB + + + Database schema definition and interface. + + + + + gwtorm + gwtorm + + + diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/ReviewDB.gwt.xml b/gerrit-reviewdb/src/main/java/com/google/gerrit/ReviewDB.gwt.xml new file mode 100644 index 0000000000..c5f8912705 --- /dev/null +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/ReviewDB.gwt.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AbstractAgreement.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AbstractAgreement.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/AbstractAgreement.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AbstractAgreement.java index 3364fedf62..987fc4ba16 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AbstractAgreement.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AbstractAgreement.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import java.sql.Timestamp; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/Account.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Account.java similarity index 99% rename from src/main/java/com/google/gerrit/client/reviewdb/Account.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Account.java index 95af60ed67..7b45eee7e5 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/Account.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Account.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.IntKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAccess.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAccess.java index 688185254f..051cfe7ba1 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAgreement.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAgreement.java index 75f52d3e55..8de6180add 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAgreement.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.CompoundKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAgreementAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAgreementAccess.java index 7628d7a8ea..b9f8905a66 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountAgreementAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountExternalId.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountExternalId.java index c7ad3e0a84..71f12ca4fe 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountExternalId.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.StringKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountExternalIdAccess.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountExternalIdAccess.java index 4b65724e02..02c820437c 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountExternalIdAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGeneralPreferences.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGeneralPreferences.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountGeneralPreferences.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGeneralPreferences.java index 90c4a8a049..cea77a001b 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGeneralPreferences.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGeneralPreferences.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroup.java similarity index 99% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroup.java index eb38ef212f..ea16d91a34 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroup.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.IntKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAccess.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAccess.java index 308a15e1e0..231ff0ab3b 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAgreement.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAgreement.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAgreement.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAgreement.java index 4a5d979eb0..30c54217b4 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAgreement.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAgreement.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.CompoundKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAgreementAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAgreementAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAgreementAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAgreementAccess.java index d3efaa3964..d4719341ea 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAgreementAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupAgreementAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMember.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMember.java index 835988ea21..47d7e44072 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMember.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.CompoundKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAccess.java index 8a18919170..48a20e3fb6 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAudit.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAudit.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAudit.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAudit.java index 7fb448a593..75d2c13578 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAudit.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAudit.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.CompoundKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAuditAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAuditAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAuditAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAuditAccess.java index 19e13aff11..b112059e56 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAuditAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountGroupMemberAuditAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountPatchReview.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountPatchReview.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountPatchReview.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountPatchReview.java index cde95a17bd..5a3ebeefa7 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountPatchReview.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountPatchReview.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.CompoundKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountPatchReviewAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountPatchReviewAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountPatchReviewAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountPatchReviewAccess.java index 43a05e3814..91e8837406 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountPatchReviewAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountPatchReviewAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountProjectWatch.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountProjectWatch.java index 9a0be5d13e..3217186796 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatch.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountProjectWatch.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.CompoundKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountProjectWatchAccess.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountProjectWatchAccess.java index 2aaeab71ae..ce444895b6 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountProjectWatchAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountProjectWatchAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountSshKey.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountSshKey.java index cece1b2f12..dd98695f04 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKey.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountSshKey.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.IntKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountSshKeyAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountSshKeyAccess.java index 10f4935002..c572dee660 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AccountSshKeyAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AccountSshKeyAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategory.java similarity index 99% rename from src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategory.java index 2aa5df6714..789c2deb21 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategory.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.Key; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategoryAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategoryAccess.java index 45df69933e..80bc9952dc 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategoryAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategoryValue.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategoryValue.java index 0f9a8f55ce..c91dacb459 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategoryValue.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.ShortKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategoryValueAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategoryValueAccess.java index 9b8a64c15c..e86d652bea 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ApprovalCategoryValueAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/AuthType.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AuthType.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/AuthType.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AuthType.java index 055218f857..8dabf88789 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/AuthType.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/AuthType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; public enum AuthType { /** Login relies upon the OpenID standard: {@link "http://openid.net/"} */ diff --git a/src/main/java/com/google/gerrit/client/reviewdb/Branch.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Branch.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/Branch.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Branch.java index 06b18e6f2a..0a3b392467 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/Branch.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Branch.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.StringKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/Change.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Change.java similarity index 99% rename from src/main/java/com/google/gerrit/client/reviewdb/Change.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Change.java index cda6d22f56..86104ebfe4 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/Change.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Change.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.IntKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeAccess.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeAccess.java index 97bed628d1..b95204bbb2 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessage.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessage.java index 521aa7ff48..5b27aedb6e 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessage.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.StringKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessageAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessageAccess.java index da95329f2d..377aa59c79 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ChangeMessageAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/rpc/CodedEnum.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/CodedEnum.java similarity index 95% rename from src/main/java/com/google/gerrit/client/rpc/CodedEnum.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/CodedEnum.java index 006860a169..59002929d8 100644 --- a/src/main/java/com/google/gerrit/client/rpc/CodedEnum.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/CodedEnum.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.rpc; +package com.google.gerrit.reviewdb; /** Extension of Enum which provides distinct character code values. */ public interface CodedEnum { diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ContactInformation.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ContactInformation.java index 660e66aa48..b8af7790e7 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ContactInformation.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ContributorAgreement.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ContributorAgreement.java index aff32ccf9a..ba22ffbbc1 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ContributorAgreement.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.IntKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ContributorAgreementAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ContributorAgreementAccess.java index 9c40c90714..ae7b41d557 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ContributorAgreementAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/Patch.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Patch.java similarity index 90% rename from src/main/java/com/google/gerrit/client/reviewdb/Patch.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Patch.java index 73ddd87607..8f05379a7a 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/Patch.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Patch.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; -import com.google.gerrit.client.rpc.CodedEnum; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.StringKey; @@ -115,11 +114,9 @@ public final class Patch { * is formatted in the POSIX standard unified diff format. * *

- * Usually Gerrit renders a UNIFIED patch in a - * {@link com.google.gerrit.client.patches.PatchScreen.SideBySide} view, + * Usually Gerrit renders a UNIFIED patch in a PatchScreen.SideBySide view, * presenting the file in two columns. If the user chooses, a - * {@link com.google.gerrit.client.patches.PatchScreen.Unified} is also a - * valid display method. + * PatchScreen.Unified is also a valid display method. * */ UNIFIED('U'), @@ -132,9 +129,9 @@ public final class Patch { * file has been replaced with a different image. * *

- * Gerrit can only render a BINARY file in a - * {@link com.google.gerrit.client.patches.PatchScreen.Unified} view, as the - * only information it can display is the old and new file content hashes. + * Gerrit can only render a BINARY file in a PatchScreen.Unified view, as + * the only information it can display is the old and new file content + * hashes. */ BINARY('B'), @@ -152,8 +149,7 @@ public final class Patch { * as that denotes that the patch set is a merge commit. * *

- * Gerrit can only render an N_WAY file in a - * {@link com.google.gerrit.client.patches.PatchScreen.Unified} view, as it + * Gerrit can only render an N_WAY file in a PatchScreen.Unified view, as it * does not have code to split the n-way unified diff into multiple edit * lists, one per pre-image. However, a logical way to display this format * would be an n-way table, with n+1 columns displayed (n pre-images, +1 diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchLineComment.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchLineComment.java index 90dcc2f6e3..a9c419c86c 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchLineComment.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.StringKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchLineCommentAccess.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchLineCommentAccess.java index 59bff87e69..6beacde7eb 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchLineCommentAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSet.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSet.java index f60ad7f44e..771981c7a0 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSet.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.IntKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAccess.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAccess.java index 72df200b39..fa594f7694 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAncestor.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAncestor.java index 8b45848daf..f22d3f79d2 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAncestor.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.IntKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAncestorAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAncestorAccess.java index d492fa5cf8..eeea37218d 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetAncestorAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetApproval.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetApproval.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/PatchSetApproval.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetApproval.java index 75a4660446..b3a58df483 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetApproval.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetApproval.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.CompoundKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetApprovalAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetApprovalAccess.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/PatchSetApprovalAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetApprovalAccess.java index c74f4e4e50..417d264ccf 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetApprovalAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetApprovalAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetInfo.java similarity index 94% rename from src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetInfo.java index d486d584b3..39fd8fa5d3 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/PatchSetInfo.java @@ -12,13 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; /** * Additional data about a {@link PatchSet} not normally loaded. - * - * @see com.google.gerrit.server.patch.PatchSetInfoFactory */ public final class PatchSetInfo { protected PatchSet.Id key; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/Project.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Project.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/Project.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Project.java index f6d08a17ad..ae79919bdb 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/Project.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Project.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.IntKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ProjectAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ProjectAccess.java index 7b6030e803..e406a8fdec 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ProjectAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ProjectRight.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ProjectRight.java index 46b6d60710..7dddc28f71 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ProjectRight.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ProjectRight.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.CompoundKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ProjectRightAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ProjectRightAccess.java index 4f722f9608..49ccda72a0 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ProjectRightAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ProjectRightAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/RevId.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/RevId.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/RevId.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/RevId.java index 642fe7a876..bea6fb8aad 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/RevId.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/RevId.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ReviewDb.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ReviewDb.java index 3a2fc6d5f2..f962e33cca 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/ReviewDb.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.Relation; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SchemaVersion.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SchemaVersion.java index 45b27a637c..896d827e25 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersion.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SchemaVersion.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.StringKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SchemaVersionAccess.java similarity index 95% rename from src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SchemaVersionAccess.java index ba37b7aa1c..520435c961 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/SchemaVersionAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SchemaVersionAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/StarredChange.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/StarredChange.java index 02c3604fbc..2f6307930a 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/StarredChange.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.CompoundKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/StarredChangeAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/StarredChangeAccess.java index 8c249593a0..9e31dbfe85 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/StarredChangeAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SystemConfig.java similarity index 98% rename from src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SystemConfig.java index 99a1c85db9..3238bb05ac 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SystemConfig.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Column; import com.google.gwtorm.client.StringKey; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SystemConfigAccess.java similarity index 96% rename from src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SystemConfigAccess.java index f93d99057d..dfca1caebb 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/SystemConfigAccess.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import com.google.gwtorm.client.Access; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/UserIdentity.java similarity index 97% rename from src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java rename to gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/UserIdentity.java index 4198d76dcc..6eabbda385 100644 --- a/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/UserIdentity.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.client.reviewdb; +package com.google.gerrit.reviewdb; import java.sql.Timestamp; diff --git a/gerrit-server/.gitignore b/gerrit-server/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-server/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-server/.settings/org.eclipse.core.resources.prefs b/gerrit-server/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-server/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-server/.settings/org.eclipse.core.runtime.prefs b/gerrit-server/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-server/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-server/.settings/org.eclipse.jdt.core.prefs b/gerrit-server/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-server/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-server/.settings/org.eclipse.jdt.ui.prefs b/gerrit-server/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-server/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-server/pom.xml b/gerrit-server/pom.xml new file mode 100644 index 0000000000..8a5b4e0f25 --- /dev/null +++ b/gerrit-server/pom.xml @@ -0,0 +1,131 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-server + Gerrit Code Review - Server + + + Commons server routines + + + + + org.eclipse + jgit + + + + net.sf.ehcache + ehcache-core + + + + commons-net + commons-net + + + + org.slf4j + slf4j-api + + + + bouncycastle + bcpg-jdk15 + 140 + provided + + + + eu.medsea.mimeutil + mime-util + + + + org.antlr + antlr + + + + com.google.code.guice + guice + + + + com.google.code.guice + guice-servlet + + + + com.google.code.guice + guice-assistedinject + + + + aopalliance + aopalliance + + + + com.google.gerrit + gerrit-common + + + + com.google.gerrit + gerrit-util-ssl + + + + com.google.gerrit + gerrit-patch-commonsnet + + + + com.h2database + h2 + test + + + + + + + org.antlr + antlr3-maven-plugin + 3.1.1 + + + + antlr + + + + + + + diff --git a/src/main/antlr/com/google/gerrit/server/query/Query.g b/gerrit-server/src/main/antlr/com/google/gerrit/server/query/Query.g similarity index 100% rename from src/main/antlr/com/google/gerrit/server/query/Query.g rename to gerrit-server/src/main/antlr/com/google/gerrit/server/query/Query.g diff --git a/gerrit-server/src/main/java/com/google/gerrit/common/Version.java b/gerrit-server/src/main/java/com/google/gerrit/common/Version.java new file mode 100644 index 0000000000..b4c5e7b872 --- /dev/null +++ b/gerrit-server/src/main/java/com/google/gerrit/common/Version.java @@ -0,0 +1,52 @@ +// Copyright (C) 2009 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.common; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +public class Version { + private static final String version; + + public static String getVersion() { + return version; + } + + static { + version = loadVersion(); + } + + private static String loadVersion() { + InputStream in = Version.class.getResourceAsStream("Version.properties"); + if (in == null) { + return null; + } + try { + final Properties p = new Properties(); + try { + p.load(in); + } finally { + in.close(); + } + return p.getProperty("version"); + } catch (IOException e) { + return null; + } + } + + private Version() { + } +} diff --git a/src/main/java/com/google/gerrit/server/AccessPath.java b/gerrit-server/src/main/java/com/google/gerrit/server/AccessPath.java similarity index 100% rename from src/main/java/com/google/gerrit/server/AccessPath.java rename to gerrit-server/src/main/java/com/google/gerrit/server/AccessPath.java diff --git a/src/main/java/com/google/gerrit/server/AnonymousUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/AnonymousUser.java similarity index 92% rename from src/main/java/com/google/gerrit/server/AnonymousUser.java rename to gerrit-server/src/main/java/com/google/gerrit/server/AnonymousUser.java index 73472f0ba3..a17149743f 100644 --- a/src/main/java/com/google/gerrit/server/AnonymousUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/AnonymousUser.java @@ -14,8 +14,8 @@ package com.google.gerrit.server; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Change; import com.google.gerrit.server.config.AuthConfig; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java similarity index 96% rename from src/main/java/com/google/gerrit/server/ChangeUtil.java rename to gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java index 8fe9bb9f31..b7decd74da 100644 --- a/src/main/java/com/google/gerrit/server/ChangeUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java @@ -14,8 +14,8 @@ package com.google.gerrit.server; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gwtorm.client.OrmException; import org.eclipse.jgit.util.Base64; diff --git a/src/main/java/com/google/gerrit/server/CurrentUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java similarity index 95% rename from src/main/java/com/google/gerrit/server/CurrentUser.java rename to gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java index adbbcaca46..d3034ceb8a 100644 --- a/src/main/java/com/google/gerrit/server/CurrentUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java @@ -14,8 +14,8 @@ package com.google.gerrit.server; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Change; import com.google.gerrit.server.config.AuthConfig; import com.google.inject.servlet.RequestScoped; diff --git a/src/main/java/com/google/gerrit/server/FileTypeRegistry.java b/gerrit-server/src/main/java/com/google/gerrit/server/FileTypeRegistry.java similarity index 100% rename from src/main/java/com/google/gerrit/server/FileTypeRegistry.java rename to gerrit-server/src/main/java/com/google/gerrit/server/FileTypeRegistry.java diff --git a/src/main/java/com/google/gerrit/server/GerritPersonIdent.java b/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdent.java similarity index 100% rename from src/main/java/com/google/gerrit/server/GerritPersonIdent.java rename to gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdent.java diff --git a/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java similarity index 100% rename from src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java diff --git a/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java similarity index 96% rename from src/main/java/com/google/gerrit/server/IdentifiedUser.java rename to gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java index 52d93cfff1..b7c2219fcf 100644 --- a/src/main/java/com/google/gerrit/server/IdentifiedUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java @@ -14,11 +14,11 @@ package com.google.gerrit.server; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.StarredChange; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.StarredChange; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.account.Realm; diff --git a/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java b/gerrit-server/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java similarity index 100% rename from src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java rename to gerrit-server/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java diff --git a/src/main/java/com/google/gerrit/server/ParamertizedString.java b/gerrit-server/src/main/java/com/google/gerrit/server/ParamertizedString.java similarity index 100% rename from src/main/java/com/google/gerrit/server/ParamertizedString.java rename to gerrit-server/src/main/java/com/google/gerrit/server/ParamertizedString.java diff --git a/src/main/java/com/google/gerrit/server/RemotePeer.java b/gerrit-server/src/main/java/com/google/gerrit/server/RemotePeer.java similarity index 100% rename from src/main/java/com/google/gerrit/server/RemotePeer.java rename to gerrit-server/src/main/java/com/google/gerrit/server/RemotePeer.java diff --git a/src/main/java/com/google/gerrit/server/ReplicationUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/ReplicationUser.java similarity index 94% rename from src/main/java/com/google/gerrit/server/ReplicationUser.java rename to gerrit-server/src/main/java/com/google/gerrit/server/ReplicationUser.java index 0885af8e39..e6e7786a26 100644 --- a/src/main/java/com/google/gerrit/server/ReplicationUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ReplicationUser.java @@ -14,8 +14,8 @@ package com.google.gerrit.server; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Change; import com.google.gerrit.server.config.AuthConfig; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/RequestCleanup.java b/gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java similarity index 100% rename from src/main/java/com/google/gerrit/server/RequestCleanup.java rename to gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java diff --git a/src/main/java/com/google/gerrit/server/UrlEncoded.java b/gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java similarity index 100% rename from src/main/java/com/google/gerrit/server/UrlEncoded.java rename to gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java diff --git a/src/main/java/com/google/gerrit/server/account/AccountByEmailCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCache.java similarity index 94% rename from src/main/java/com/google/gerrit/server/account/AccountByEmailCache.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCache.java index 89e022d9fa..1eb1a4f772 100644 --- a/src/main/java/com/google/gerrit/server/account/AccountByEmailCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCache.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; import java.util.Set; diff --git a/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java similarity index 95% rename from src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java index cfabdf8b0d..d4f7a4d2fc 100644 --- a/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.cache.SelfPopulatingCache; diff --git a/src/main/java/com/google/gerrit/server/account/AccountCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCache.java similarity index 94% rename from src/main/java/com/google/gerrit/server/account/AccountCache.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCache.java index 4c8b2eb5a9..e2370cd25d 100644 --- a/src/main/java/com/google/gerrit/server/account/AccountCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCache.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; /** Caches important (but small) account state to avoid database hits. */ public interface AccountCache { diff --git a/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java similarity index 94% rename from src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java index 3a347c8463..4aaff7a577 100644 --- a/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountGroupMember; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroupMember; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.cache.SelfPopulatingCache; diff --git a/src/main/java/com/google/gerrit/server/account/AccountException.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java similarity index 100% rename from src/main/java/com/google/gerrit/server/account/AccountException.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java diff --git a/src/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java similarity index 93% rename from src/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java index af7681b01f..bb6e278e3e 100644 --- a/src/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.data.AccountInfo; -import com.google.gerrit.client.data.AccountInfoCache; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.common.data.AccountInfo; +import com.google.gerrit.common.data.AccountInfoCache; +import com.google.gerrit.reviewdb.Account; import com.google.inject.Inject; import java.util.ArrayList; diff --git a/src/main/java/com/google/gerrit/server/account/AccountManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java similarity index 97% rename from src/main/java/com/google/gerrit/server/account/AccountManager.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java index 0224403096..f4c4b7b672 100644 --- a/src/main/java/com/google/gerrit/server/account/AccountManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.auth.openid.OpenIdUtil; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.common.auth.openid.OpenIdUrls; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.config.AuthConfig; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; @@ -160,14 +160,14 @@ public class AccountManager { private AuthResult create(final ReviewDb db, final AuthRequest who) throws OrmException, AccountException { if (authConfig.isAllowGoogleAccountUpgrade() - && who.isScheme(OpenIdUtil.URL_GOOGLE + "?") + && who.isScheme(OpenIdUrls.URL_GOOGLE + "?") && who.getEmailAddress() != null) { final List openId = new ArrayList(); final List v1 = new ArrayList(); for (final AccountExternalId extId : db.accountExternalIds() .byEmailAddress(who.getEmailAddress())) { - if (extId.isScheme(OpenIdUtil.URL_GOOGLE + "?")) { + if (extId.isScheme(OpenIdUrls.URL_GOOGLE + "?")) { openId.add(extId); } else if (extId.isScheme(AccountExternalId.LEGACY_GAE)) { v1.add(extId); diff --git a/src/main/java/com/google/gerrit/server/account/AccountResolver.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java similarity index 96% rename from src/main/java/com/google/gerrit/server/account/AccountResolver.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java index ff36faebb7..bc548d7223 100644 --- a/src/main/java/com/google/gerrit/server/account/AccountResolver.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.ResultSet; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/account/AccountState.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountState.java similarity index 93% rename from src/main/java/com/google/gerrit/server/account/AccountState.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AccountState.java index 2210cff911..4c8103a187 100644 --- a/src/main/java/com/google/gerrit/server/account/AccountState.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountState.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.AccountGroup; import java.util.Collection; import java.util.HashSet; diff --git a/src/main/java/com/google/gerrit/server/account/AuthRequest.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java similarity index 94% rename from src/main/java/com/google/gerrit/server/account/AuthRequest.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java index f554f8b326..060224613f 100644 --- a/src/main/java/com/google/gerrit/server/account/AuthRequest.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.account; -import static com.google.gerrit.client.reviewdb.AccountExternalId.SCHEME_GERRIT; -import static com.google.gerrit.client.reviewdb.AccountExternalId.SCHEME_MAILTO; +import static com.google.gerrit.reviewdb.AccountExternalId.SCHEME_GERRIT; +import static com.google.gerrit.reviewdb.AccountExternalId.SCHEME_MAILTO; /** * Information for {@link AccountManager#authenticate(AuthRequest)}. diff --git a/src/main/java/com/google/gerrit/server/account/AuthResult.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthResult.java similarity index 96% rename from src/main/java/com/google/gerrit/server/account/AuthResult.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/AuthResult.java index 84b030c541..569216be84 100644 --- a/src/main/java/com/google/gerrit/server/account/AuthResult.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthResult.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; /** Result from {@link AccountManager#authenticate(AuthRequest)}. */ public class AuthResult { diff --git a/src/main/java/com/google/gerrit/server/account/DefaultRealm.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java similarity index 95% rename from src/main/java/com/google/gerrit/server/account/DefaultRealm.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java index efd6df8a0c..a836f543dc 100644 --- a/src/main/java/com/google/gerrit/server/account/DefaultRealm.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; import com.google.inject.Inject; import java.util.Collections; diff --git a/src/main/java/com/google/gerrit/server/account/EmailExpander.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java similarity index 100% rename from src/main/java/com/google/gerrit/server/account/EmailExpander.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java diff --git a/src/main/java/com/google/gerrit/server/account/GroupCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCache.java similarity index 94% rename from src/main/java/com/google/gerrit/server/account/GroupCache.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCache.java index 1a2ac2a0db..880ae2cc49 100644 --- a/src/main/java/com/google/gerrit/server/account/GroupCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCache.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroup; /** Tracks group objects in memory for efficient access. */ public interface GroupCache { diff --git a/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java similarity index 98% rename from src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java index f49824f135..74e3218453 100644 --- a/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.cache.SelfPopulatingCache; diff --git a/src/main/java/com/google/gerrit/server/account/GroupControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java similarity index 95% rename from src/main/java/com/google/gerrit/server/account/GroupControl.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java index e3284cdc3b..40360b9f77 100644 --- a/src/main/java/com/google/gerrit/server/account/GroupControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; import com.google.gerrit.server.CurrentUser; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/src/main/java/com/google/gerrit/server/account/NoSuchGroupException.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/NoSuchGroupException.java similarity index 95% rename from src/main/java/com/google/gerrit/server/account/NoSuchGroupException.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/NoSuchGroupException.java index ce1b3935da..5cd2003442 100644 --- a/src/main/java/com/google/gerrit/server/account/NoSuchGroupException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/NoSuchGroupException.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroup; /** Indicates the account group does not exist. */ public class NoSuchGroupException extends Exception { diff --git a/src/main/java/com/google/gerrit/server/account/Realm.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/Realm.java similarity index 93% rename from src/main/java/com/google/gerrit/server/account/Realm.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/Realm.java index 9b57087e42..e42d4ae322 100644 --- a/src/main/java/com/google/gerrit/server/account/Realm.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/Realm.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.account; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; import java.util.Set; diff --git a/src/main/java/com/google/gerrit/server/ldap/LdapModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapModule.java similarity index 91% rename from src/main/java/com/google/gerrit/server/ldap/LdapModule.java rename to gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapModule.java index d55e6515d0..352e4664e0 100644 --- a/src/main/java/com/google/gerrit/server/ldap/LdapModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapModule.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ldap; +package com.google.gerrit.server.auth.ldap; import static java.util.concurrent.TimeUnit.HOURS; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; import com.google.gerrit.server.account.Realm; import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.CacheModule; diff --git a/src/main/java/com/google/gerrit/server/ldap/LdapQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java similarity index 98% rename from src/main/java/com/google/gerrit/server/ldap/LdapQuery.java rename to gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java index 3055fe6f5f..868e26a888 100644 --- a/src/main/java/com/google/gerrit/server/ldap/LdapQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ldap; +package com.google.gerrit.server.auth.ldap; import com.google.gerrit.server.ParamertizedString; diff --git a/src/main/java/com/google/gerrit/server/ldap/LdapRealm.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java similarity index 98% rename from src/main/java/com/google/gerrit/server/ldap/LdapRealm.java rename to gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java index 47aa33d359..1eaa55cf35 100644 --- a/src/main/java/com/google/gerrit/server/ldap/LdapRealm.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ldap; +package com.google.gerrit.server.auth.ldap; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AuthType; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AuthType; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.ParamertizedString; import com.google.gerrit.server.account.AccountException; import com.google.gerrit.server.account.AccountState; @@ -31,7 +31,7 @@ import com.google.gerrit.server.cache.SelfPopulatingCache; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.ioutil.BlindSSLSocketFactory; +import com.google.gerrit.util.ssl.BlindSSLSocketFactory; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/ldap/LdapType.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java similarity index 98% rename from src/main/java/com/google/gerrit/server/ldap/LdapType.java rename to gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java index a0227552cb..4a0ea2cc49 100644 --- a/src/main/java/com/google/gerrit/server/ldap/LdapType.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ldap; +package com.google.gerrit.server.auth.ldap; import javax.naming.NamingEnumeration; import javax.naming.NamingException; diff --git a/src/main/java/com/google/gerrit/server/ldap/SearchScope.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java similarity index 96% rename from src/main/java/com/google/gerrit/server/ldap/SearchScope.java rename to gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java index dcc6089d81..369914dc60 100644 --- a/src/main/java/com/google/gerrit/server/ldap/SearchScope.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ldap; +package com.google.gerrit.server.auth.ldap; import javax.naming.directory.SearchControls; diff --git a/src/main/java/com/google/gerrit/server/cache/Cache.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/Cache.java similarity index 100% rename from src/main/java/com/google/gerrit/server/cache/Cache.java rename to gerrit-server/src/main/java/com/google/gerrit/server/cache/Cache.java diff --git a/src/main/java/com/google/gerrit/server/cache/CacheModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheModule.java similarity index 100% rename from src/main/java/com/google/gerrit/server/cache/CacheModule.java rename to gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheModule.java diff --git a/src/main/java/com/google/gerrit/server/cache/CachePool.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/CachePool.java similarity index 100% rename from src/main/java/com/google/gerrit/server/cache/CachePool.java rename to gerrit-server/src/main/java/com/google/gerrit/server/cache/CachePool.java diff --git a/src/main/java/com/google/gerrit/server/cache/CacheProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheProvider.java similarity index 100% rename from src/main/java/com/google/gerrit/server/cache/CacheProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheProvider.java diff --git a/src/main/java/com/google/gerrit/server/cache/EvictionPolicy.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/EvictionPolicy.java similarity index 100% rename from src/main/java/com/google/gerrit/server/cache/EvictionPolicy.java rename to gerrit-server/src/main/java/com/google/gerrit/server/cache/EvictionPolicy.java diff --git a/src/main/java/com/google/gerrit/server/cache/NamedCacheBinding.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/NamedCacheBinding.java similarity index 100% rename from src/main/java/com/google/gerrit/server/cache/NamedCacheBinding.java rename to gerrit-server/src/main/java/com/google/gerrit/server/cache/NamedCacheBinding.java diff --git a/src/main/java/com/google/gerrit/server/cache/ProxyEhcache.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/ProxyEhcache.java similarity index 100% rename from src/main/java/com/google/gerrit/server/cache/ProxyEhcache.java rename to gerrit-server/src/main/java/com/google/gerrit/server/cache/ProxyEhcache.java diff --git a/src/main/java/com/google/gerrit/server/cache/SelfPopulatingCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/SelfPopulatingCache.java similarity index 100% rename from src/main/java/com/google/gerrit/server/cache/SelfPopulatingCache.java rename to gerrit-server/src/main/java/com/google/gerrit/server/cache/SelfPopulatingCache.java diff --git a/src/main/java/com/google/gerrit/server/cache/SimpleCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/SimpleCache.java similarity index 100% rename from src/main/java/com/google/gerrit/server/cache/SimpleCache.java rename to gerrit-server/src/main/java/com/google/gerrit/server/cache/SimpleCache.java diff --git a/src/main/java/com/google/gerrit/server/cache/UnnamedCacheBinding.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/UnnamedCacheBinding.java similarity index 100% rename from src/main/java/com/google/gerrit/server/cache/UnnamedCacheBinding.java rename to gerrit-server/src/main/java/com/google/gerrit/server/cache/UnnamedCacheBinding.java diff --git a/src/main/java/com/google/gerrit/server/config/ApprovalTypesProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ApprovalTypesProvider.java similarity index 88% rename from src/main/java/com/google/gerrit/server/config/ApprovalTypesProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/ApprovalTypesProvider.java index d8a20110be..25ab239fe9 100644 --- a/src/main/java/com/google/gerrit/server/config/ApprovalTypesProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ApprovalTypesProvider.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.config; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/config/AuthConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java similarity index 96% rename from src/main/java/com/google/gerrit/server/config/AuthConfig.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java index 0756c645b0..64fe6820e0 100644 --- a/src/main/java/com/google/gerrit/server/config/AuthConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.config; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AuthType; -import com.google.gerrit.client.reviewdb.SystemConfig; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AuthType; +import com.google.gerrit.reviewdb.SystemConfig; import com.google.gwtjsonrpc.server.SignedToken; import com.google.gwtjsonrpc.server.XsrfException; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/config/CanonicalWebUrl.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrl.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/CanonicalWebUrl.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrl.java diff --git a/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlModule.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/CanonicalWebUrlModule.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlModule.java diff --git a/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java diff --git a/src/main/java/com/google/gerrit/server/config/ConfigUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/ConfigUtil.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java diff --git a/src/main/java/com/google/gerrit/server/config/DatabaseModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/DatabaseModule.java similarity index 93% rename from src/main/java/com/google/gerrit/server/config/DatabaseModule.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/DatabaseModule.java index f59db12e30..659872a2be 100644 --- a/src/main/java/com/google/gerrit/server/config/DatabaseModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/DatabaseModule.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.config; import static com.google.inject.Scopes.SINGLETON; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.SystemConfig; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.SystemConfig; import com.google.gwtorm.client.SchemaFactory; import com.google.gwtorm.jdbc.Database; import com.google.inject.Key; diff --git a/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java diff --git a/src/main/java/com/google/gerrit/server/config/FactoryModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/FactoryModule.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/FactoryModule.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/FactoryModule.java diff --git a/src/main/java/com/google/gerrit/server/config/GerritConfigModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritConfigModule.java similarity index 96% rename from src/main/java/com/google/gerrit/server/config/GerritConfigModule.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/GerritConfigModule.java index 43a094499d..a512654509 100644 --- a/src/main/java/com/google/gerrit/server/config/GerritConfigModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritConfigModule.java @@ -16,7 +16,7 @@ package com.google.gerrit.server.config; import static com.google.inject.Scopes.SINGLETON; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Project; import com.google.inject.AbstractModule; import org.eclipse.jgit.lib.Config; diff --git a/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java similarity index 89% rename from src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java index 83a16ce821..406a772618 100644 --- a/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java @@ -17,18 +17,8 @@ package com.google.gerrit.server.config; import static com.google.inject.Scopes.SINGLETON; import static com.google.inject.Stage.PRODUCTION; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.reviewdb.AuthType; -import com.google.gerrit.git.ChangeMergeQueue; -import com.google.gerrit.git.GitRepositoryManager; -import com.google.gerrit.git.MergeOp; -import com.google.gerrit.git.MergeQueue; -import com.google.gerrit.git.PatchSetImporter; -import com.google.gerrit.git.PushAllProjectsOp; -import com.google.gerrit.git.PushReplication; -import com.google.gerrit.git.ReloadSubmitQueueOp; -import com.google.gerrit.git.ReplicationQueue; -import com.google.gerrit.git.WorkQueue; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.reviewdb.AuthType; import com.google.gerrit.server.AnonymousUser; import com.google.gerrit.server.FileTypeRegistry; import com.google.gerrit.server.GerritPersonIdent; @@ -43,8 +33,18 @@ import com.google.gerrit.server.account.DefaultRealm; import com.google.gerrit.server.account.EmailExpander; import com.google.gerrit.server.account.GroupCacheImpl; import com.google.gerrit.server.account.Realm; +import com.google.gerrit.server.auth.ldap.LdapModule; import com.google.gerrit.server.cache.CachePool; -import com.google.gerrit.server.ldap.LdapModule; +import com.google.gerrit.server.git.ChangeMergeQueue; +import com.google.gerrit.server.git.GitRepositoryManager; +import com.google.gerrit.server.git.MergeOp; +import com.google.gerrit.server.git.MergeQueue; +import com.google.gerrit.server.git.PatchSetImporter; +import com.google.gerrit.server.git.PushAllProjectsOp; +import com.google.gerrit.server.git.PushReplication; +import com.google.gerrit.server.git.ReloadSubmitQueueOp; +import com.google.gerrit.server.git.ReplicationQueue; +import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.mail.AbandonedSender; import com.google.gerrit.server.mail.CommentSender; import com.google.gerrit.server.mail.EmailSender; @@ -58,7 +58,6 @@ import com.google.gerrit.server.patch.PatchListCacheImpl; import com.google.gerrit.server.patch.PatchSetInfoFactory; import com.google.gerrit.server.project.ProjectCacheImpl; import com.google.gerrit.server.project.ProjectState; -import com.google.gerrit.server.ssh.SshKeyCacheImpl; import com.google.gerrit.server.workflow.FunctionState; import com.google.inject.Guice; import com.google.inject.Inject; @@ -130,7 +129,6 @@ public class GerritGlobalModule extends FactoryModule { install(GroupCacheImpl.module()); install(PatchListCacheImpl.module()); install(ProjectCacheImpl.module()); - install(SshKeyCacheImpl.module()); factory(AccountInfoCacheFactory.Factory.class); factory(ProjectState.Factory.class); diff --git a/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java similarity index 97% rename from src/main/java/com/google/gerrit/server/config/GerritRequestModule.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java index 171b418037..fa6e0149df 100644 --- a/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java @@ -16,7 +16,7 @@ package com.google.gerrit.server.config; import static com.google.inject.Scopes.SINGLETON; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.RequestCleanup; import com.google.gerrit.server.account.AccountResolver; diff --git a/src/main/java/com/google/gerrit/server/config/GerritServerConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfig.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/GerritServerConfig.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfig.java diff --git a/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java diff --git a/src/main/java/com/google/gerrit/server/config/Nullable.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/Nullable.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/Nullable.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/Nullable.java diff --git a/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java similarity index 97% rename from src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java index 69521fc59b..5aa78cbb2d 100644 --- a/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.config; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.RequestCleanup; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.jdbc.Database; diff --git a/src/main/java/com/google/gerrit/server/config/ReviewDbDataSourceProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ReviewDbDataSourceProvider.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/ReviewDbDataSourceProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/ReviewDbDataSourceProvider.java diff --git a/src/main/java/com/google/gerrit/server/config/ReviewDbDatabaseProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ReviewDbDatabaseProvider.java similarity index 96% rename from src/main/java/com/google/gerrit/server/config/ReviewDbDatabaseProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/ReviewDbDatabaseProvider.java index 06805db77d..e5b7e8119a 100644 --- a/src/main/java/com/google/gerrit/server/config/ReviewDbDatabaseProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ReviewDbDatabaseProvider.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.config; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.jdbc.Database; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/config/SitePath.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePath.java similarity index 100% rename from src/main/java/com/google/gerrit/server/config/SitePath.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/SitePath.java diff --git a/src/main/java/com/google/gerrit/server/config/SitePathProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePathProvider.java similarity index 95% rename from src/main/java/com/google/gerrit/server/config/SitePathProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/SitePathProvider.java index 4965f1b049..f9fb021c84 100644 --- a/src/main/java/com/google/gerrit/server/config/SitePathProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePathProvider.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.config; -import com.google.gerrit.client.reviewdb.SystemConfig; +import com.google.gerrit.reviewdb.SystemConfig; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/src/main/java/com/google/gerrit/server/config/SystemConfigProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/SystemConfigProvider.java similarity index 96% rename from src/main/java/com/google/gerrit/server/config/SystemConfigProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/SystemConfigProvider.java index ab5a2933f0..5621b4fb09 100644 --- a/src/main/java/com/google/gerrit/server/config/SystemConfigProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/SystemConfigProvider.java @@ -14,14 +14,14 @@ package com.google.gerrit.server.config; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.SchemaVersion; -import com.google.gerrit.client.reviewdb.SystemConfig; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.SchemaVersion; +import com.google.gerrit.reviewdb.SystemConfig; import com.google.gerrit.server.workflow.NoOpFunction; import com.google.gerrit.server.workflow.SubmitFunction; import com.google.gwtjsonrpc.server.SignedToken; diff --git a/src/main/java/com/google/gerrit/server/config/WildProjectName.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/WildProjectName.java similarity index 95% rename from src/main/java/com/google/gerrit/server/config/WildProjectName.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/WildProjectName.java index 7c7bfa92dc..3df550aabd 100644 --- a/src/main/java/com/google/gerrit/server/config/WildProjectName.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/WildProjectName.java @@ -16,7 +16,7 @@ package com.google.gerrit.server.config; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Project; import com.google.inject.BindingAnnotation; import java.lang.annotation.Retention; diff --git a/src/main/java/com/google/gerrit/server/config/WildProjectNameProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/WildProjectNameProvider.java similarity index 89% rename from src/main/java/com/google/gerrit/server/config/WildProjectNameProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/WildProjectNameProvider.java index 1d67491de7..bf35ca8beb 100644 --- a/src/main/java/com/google/gerrit/server/config/WildProjectNameProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/WildProjectNameProvider.java @@ -1,8 +1,8 @@ package com.google.gerrit.server.config; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.SystemConfig; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.SystemConfig; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/contact/ContactStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/contact/ContactStore.java similarity index 81% rename from src/main/java/com/google/gerrit/server/contact/ContactStore.java rename to gerrit-server/src/main/java/com/google/gerrit/server/contact/ContactStore.java index ebdf467c55..84c7c75eae 100644 --- a/src/main/java/com/google/gerrit/server/contact/ContactStore.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/contact/ContactStore.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.contact; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ContactInformation; -import com.google.gerrit.client.rpc.ContactInformationStoreException; +import com.google.gerrit.common.errors.ContactInformationStoreException; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ContactInformation; public interface ContactStore { boolean isEnabled(); diff --git a/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java similarity index 98% rename from src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java index 977d86093f..9ad4a716f1 100644 --- a/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.contact; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePath; import com.google.gwtorm.client.SchemaFactory; diff --git a/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java similarity index 97% rename from src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java rename to gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java index 74a533e37b..bd79dc4906 100644 --- a/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.contact; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.ContactInformation; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.rpc.ContactInformationStoreException; +import com.google.gerrit.common.errors.ContactInformationStoreException; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.ContactInformation; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.UrlEncoded; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; diff --git a/src/main/java/com/google/gerrit/server/contact/NoContactStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/contact/NoContactStore.java similarity index 84% rename from src/main/java/com/google/gerrit/server/contact/NoContactStore.java rename to gerrit-server/src/main/java/com/google/gerrit/server/contact/NoContactStore.java index 1cd2f0822a..e219186446 100644 --- a/src/main/java/com/google/gerrit/server/contact/NoContactStore.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/contact/NoContactStore.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.contact; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ContactInformation; -import com.google.gerrit.client.rpc.ContactInformationStoreException; +import com.google.gerrit.common.errors.ContactInformationStoreException; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ContactInformation; class NoContactStore implements ContactStore { @Override diff --git a/src/main/java/com/google/gerrit/git/ChangeMergeQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java similarity index 97% rename from src/main/java/com/google/gerrit/git/ChangeMergeQueue.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java index 0e7c8d529e..d6c8f4ab3b 100644 --- a/src/main/java/com/google/gerrit/git/ChangeMergeQueue.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Project; import com.google.inject.Inject; import org.slf4j.Logger; diff --git a/src/main/java/com/google/gerrit/git/CodeReviewCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/CodeReviewCommit.java similarity index 93% rename from src/main/java/com/google/gerrit/git/CodeReviewCommit.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/CodeReviewCommit.java index 0b67e43553..863c0bd80f 100644 --- a/src/main/java/com/google/gerrit/git/CodeReviewCommit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/CodeReviewCommit.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSet; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ObjectId; diff --git a/src/main/java/com/google/gerrit/git/CommitMergeStatus.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java similarity index 96% rename from src/main/java/com/google/gerrit/git/CommitMergeStatus.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java index 665a0425b2..788d90b713 100644 --- a/src/main/java/com/google/gerrit/git/CommitMergeStatus.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/CommitMergeStatus.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; enum CommitMergeStatus { /** */ diff --git a/src/main/java/com/google/gerrit/git/DefaultQueueOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultQueueOp.java similarity index 96% rename from src/main/java/com/google/gerrit/git/DefaultQueueOp.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultQueueOp.java index 1f87b553ca..82d049302a 100644 --- a/src/main/java/com/google/gerrit/git/DefaultQueueOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultQueueOp.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/google/gerrit/git/GitRepositoryManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/GitRepositoryManager.java similarity index 99% rename from src/main/java/com/google/gerrit/git/GitRepositoryManager.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/GitRepositoryManager.java index a278501a6a..8adad05aa2 100644 --- a/src/main/java/com/google/gerrit/git/GitRepositoryManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/GitRepositoryManager.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePath; diff --git a/src/main/java/com/google/gerrit/git/MergeException.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeException.java similarity index 96% rename from src/main/java/com/google/gerrit/git/MergeException.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/MergeException.java index 902e296828..44becb525b 100644 --- a/src/main/java/com/google/gerrit/git/MergeException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; /** Indicates the current branch's queue cannot be processed at this time. */ class MergeException extends Exception { diff --git a/src/main/java/com/google/gerrit/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java similarity index 98% rename from src/main/java/com/google/gerrit/git/MergeOp.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java index d2675d7e44..5f854f58d3 100644 --- a/src/main/java/com/google/gerrit/git/MergeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java @@ -12,23 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeMessage; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.RevId; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.RevId; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; diff --git a/src/main/java/com/google/gerrit/git/MergeQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeQueue.java similarity index 91% rename from src/main/java/com/google/gerrit/git/MergeQueue.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/MergeQueue.java index aa76e2a9d5..abb0ab81c6 100644 --- a/src/main/java/com/google/gerrit/git/MergeQueue.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeQueue.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; -import com.google.gerrit.client.reviewdb.Branch; +import com.google.gerrit.reviewdb.Branch; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/google/gerrit/git/MergeSorter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java similarity index 98% rename from src/main/java/com/google/gerrit/git/MergeSorter.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java index c4dedab46c..fe87480b15 100644 --- a/src/main/java/com/google/gerrit/git/MergeSorter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommitList; diff --git a/src/main/java/com/google/gerrit/git/PatchSetImporter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PatchSetImporter.java similarity index 92% rename from src/main/java/com/google/gerrit/git/PatchSetImporter.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/PatchSetImporter.java index f9336338b2..80ad408cc8 100644 --- a/src/main/java/com/google/gerrit/git/PatchSetImporter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PatchSetImporter.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetAncestor; -import com.google.gerrit.client.reviewdb.PatchSetInfo; -import com.google.gerrit.client.reviewdb.RevId; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetAncestor; +import com.google.gerrit.reviewdb.PatchSetInfo; +import com.google.gerrit.reviewdb.RevId; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.patch.PatchSetInfoFactory; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.Transaction; diff --git a/src/main/java/com/google/gerrit/git/PushAllProjectsOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java similarity index 93% rename from src/main/java/com/google/gerrit/git/PushAllProjectsOp.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java index ee314ed4f5..5e176d6a5a 100644 --- a/src/main/java/com/google/gerrit/git/PushAllProjectsOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushAllProjectsOp.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.config.Nullable; import com.google.gerrit.server.config.WildProjectName; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/git/PushOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java similarity index 99% rename from src/main/java/com/google/gerrit/git/PushOp.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java index 5555550c3c..cdc05cd5fd 100644 --- a/src/main/java/com/google/gerrit/git/PushOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/git/PushReplication.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushReplication.java similarity index 98% rename from src/main/java/com/google/gerrit/git/PushReplication.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/PushReplication.java index aea8b7ccbe..84d5b002d4 100644 --- a/src/main/java/com/google/gerrit/git/PushReplication.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushReplication.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.ReplicationUser; import com.google.gerrit.server.config.SitePath; diff --git a/src/main/java/com/google/gerrit/git/ReloadSubmitQueueOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReloadSubmitQueueOp.java similarity index 91% rename from src/main/java/com/google/gerrit/git/ReloadSubmitQueueOp.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/ReloadSubmitQueueOp.java index a56d2ed640..356981d4db 100644 --- a/src/main/java/com/google/gerrit/git/ReloadSubmitQueueOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReloadSubmitQueueOp.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/git/ReplicationQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReplicationQueue.java similarity index 96% rename from src/main/java/com/google/gerrit/git/ReplicationQueue.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/ReplicationQueue.java index 2d71301533..d1c518d540 100644 --- a/src/main/java/com/google/gerrit/git/ReplicationQueue.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReplicationQueue.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Project; /** Manages replication to other nodes. */ public interface ReplicationQueue { diff --git a/src/main/java/com/google/gerrit/git/WorkQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java similarity index 99% rename from src/main/java/com/google/gerrit/git/WorkQueue.java rename to gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java index 27e8c3e08e..51f5c99c22 100644 --- a/src/main/java/com/google/gerrit/git/WorkQueue.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.git; +package com.google.gerrit.server.git; import com.google.inject.Singleton; diff --git a/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java b/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java similarity index 99% rename from src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java rename to gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java index a2d0887c3b..650605fbd6 100644 --- a/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java @@ -29,7 +29,7 @@ package com.google.gerrit.server.ioutil; -import com.google.gerrit.client.rpc.CodedEnum; +import com.google.gerrit.reviewdb.CodedEnum; import org.eclipse.jgit.util.NB; diff --git a/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java similarity index 96% rename from src/main/java/com/google/gerrit/server/mail/AbandonedSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java index e771ac725c..bba69c88b3 100644 --- a/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Change; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java similarity index 95% rename from src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java index 7c9e507e2c..c9a6d98411 100644 --- a/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Change; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/mail/Address.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java similarity index 100% rename from src/main/java/com/google/gerrit/server/mail/Address.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java diff --git a/src/main/java/com/google/gerrit/server/mail/CommentSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java similarity index 96% rename from src/main/java/com/google/gerrit/server/mail/CommentSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java index 7f52fac618..a010ac1576 100644 --- a/src/main/java/com/google/gerrit/server/mail/CommentSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchLineComment; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchLineComment; import com.google.gerrit.server.patch.PatchFile; import com.google.gerrit.server.patch.PatchList; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java similarity index 90% rename from src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java index 1c0bee7596..d25d584149 100644 --- a/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountGroupMember; -import com.google.gerrit.client.reviewdb.AccountProjectWatch; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroupMember; +import com.google.gerrit.reviewdb.AccountProjectWatch; +import com.google.gerrit.reviewdb.Change; import com.google.gerrit.server.project.ProjectState; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/mail/EmailException.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailException.java similarity index 100% rename from src/main/java/com/google/gerrit/server/mail/EmailException.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailException.java diff --git a/src/main/java/com/google/gerrit/server/mail/EmailHeader.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailHeader.java similarity index 100% rename from src/main/java/com/google/gerrit/server/mail/EmailHeader.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailHeader.java diff --git a/src/main/java/com/google/gerrit/server/mail/EmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailSender.java similarity index 100% rename from src/main/java/com/google/gerrit/server/mail/EmailSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailSender.java diff --git a/src/main/java/com/google/gerrit/server/mail/FromAddressGenerator.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGenerator.java similarity index 93% rename from src/main/java/com/google/gerrit/server/mail/FromAddressGenerator.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGenerator.java index 512e5e8e75..3090dc3914 100644 --- a/src/main/java/com/google/gerrit/server/mail/FromAddressGenerator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGenerator.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; /** Constructs an address to send email from. */ public interface FromAddressGenerator { diff --git a/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java similarity index 98% rename from src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java index f9322d44b7..d17bd994b7 100644 --- a/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.ParamertizedString; import com.google.gerrit.server.account.AccountCache; diff --git a/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java similarity index 96% rename from src/main/java/com/google/gerrit/server/mail/MergeFailSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java index c587d5c8db..11a541ba04 100644 --- a/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Change; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/mail/MergedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java similarity index 91% rename from src/main/java/com/google/gerrit/server/mail/MergedSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java index e49eaa0b70..a1f7d9e901 100644 --- a/src/main/java/com/google/gerrit/server/mail/MergedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java @@ -14,15 +14,15 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountProjectWatch; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSetApproval; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountProjectWatch; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSetApproval; import com.google.gerrit.server.project.ProjectState; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java similarity index 88% rename from src/main/java/com/google/gerrit/server/mail/NewChangeSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java index 9a0f41e6cf..5e38740b07 100644 --- a/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/NewChangeSender.java @@ -14,14 +14,17 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.Change; import com.google.gerrit.server.ssh.SshInfo; import com.google.inject.Inject; +import com.jcraft.jsch.HostKey; + import java.util.Collection; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Set; /** Sends an email alerting a user to a new change for them to review. */ @@ -111,13 +114,20 @@ public abstract class NewChangeSender extends OutgoingEmail { } private String getPullUrl() { + final List hostKeys = sshInfo.getHostKeys(); + if (hostKeys.isEmpty()) { + return ""; + } + + final String host = hostKeys.get(0).getHost(); final StringBuilder r = new StringBuilder(); r.append("git pull ssh://"); - String sshAddress = sshInfo.getSshdAddress(); - if (sshAddress.startsWith(":") || "".equals(sshAddress)) { + if (host.startsWith("*:")) { r.append(getGerritHost()); + r.append(host.substring(2)); + } else { + r.append(host); } - r.append(sshAddress); r.append("/"); r.append(projectName); r.append(" "); diff --git a/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java similarity index 96% rename from src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java index f54084f9ed..c49c556edb 100644 --- a/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java @@ -14,22 +14,22 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountProjectWatch; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeMessage; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.PatchSetInfo; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.StarredChange; -import com.google.gerrit.client.reviewdb.UserIdentity; -import com.google.gerrit.git.GitRepositoryManager; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountProjectWatch; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.PatchSetInfo; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.StarredChange; +import com.google.gerrit.reviewdb.UserIdentity; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.Nullable; +import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.patch.PatchListEntry; diff --git a/src/main/java/com/google/gerrit/server/mail/RecipientType.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RecipientType.java similarity index 100% rename from src/main/java/com/google/gerrit/server/mail/RecipientType.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/RecipientType.java diff --git a/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java similarity index 100% rename from src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java diff --git a/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java similarity index 89% rename from src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java index 2430ff7aa6..69b446b28a 100644 --- a/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java @@ -14,15 +14,18 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.Change; import com.google.gerrit.server.ssh.SshInfo; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import com.jcraft.jsch.HostKey; + import java.util.Collection; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Set; /** Send notice of new patch sets for reviewers. */ @@ -123,13 +126,20 @@ public class ReplacePatchSetSender extends ReplyToChangeSender { } private String getPullUrl() { + final List hostKeys = sshInfo.getHostKeys(); + if (hostKeys.isEmpty()) { + return ""; + } + + final String host = hostKeys.get(0).getHost(); final StringBuilder r = new StringBuilder(); r.append("git pull ssh://"); - String sshAddress = sshInfo.getSshdAddress(); - if (sshAddress.startsWith(":") || "".equals(sshAddress)) { + if (host.startsWith("*:")) { r.append(getGerritHost()); + r.append(host.substring(2)); + } else { + r.append(host); } - r.append(sshAddress); r.append("/"); r.append(projectName); r.append(" "); diff --git a/src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java similarity index 95% rename from src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java index 255a2ae2de..99e9565e42 100644 --- a/src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplyToChangeSender.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Change; /** Alert a user to a reply to a change, usually commentary made during review. */ public abstract class ReplyToChangeSender extends OutgoingEmail { diff --git a/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java similarity index 99% rename from src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java rename to gerrit-server/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java index d76d157b19..1fb31a037b 100644 --- a/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.mail; -import com.google.gerrit.pgm.Version; +import com.google.gerrit.common.Version; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/patch/PatchFile.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java similarity index 95% rename from src/main/java/com/google/gerrit/server/patch/PatchFile.java rename to gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java index 6bda2cc0ad..6c751dca46 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchFile.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.patch; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.rpc.CorruptEntityException; -import com.google.gerrit.client.rpc.NoSuchEntityException; +import com.google.gerrit.common.errors.CorruptEntityException; +import com.google.gerrit.common.errors.NoSuchEntityException; +import com.google.gerrit.reviewdb.Patch; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; diff --git a/src/main/java/com/google/gerrit/server/patch/PatchList.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java similarity index 98% rename from src/main/java/com/google/gerrit/server/patch/PatchList.java rename to gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java index a1a3137214..b45fb83a5e 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchList.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java @@ -24,8 +24,8 @@ import static org.eclipse.jgit.lib.ObjectIdSerialization.readNotNull; import static org.eclipse.jgit.lib.ObjectIdSerialization.writeCanBeNull; import static org.eclipse.jgit.lib.ObjectIdSerialization.writeNotNull; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gerrit.server.config.Nullable; import org.eclipse.jgit.lib.AnyObjectId; diff --git a/src/main/java/com/google/gerrit/server/patch/PatchListCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCache.java similarity index 85% rename from src/main/java/com/google/gerrit/server/patch/PatchListCache.java rename to gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCache.java index a73ab4ccbc..209d0b74d4 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchListCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCache.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.patch; -import com.google.gerrit.client.data.PatchScriptSettings.Whitespace; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSet; +import com.google.gerrit.common.data.PatchScriptSettings.Whitespace; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSet; /** Provides a cached list of {@link PatchListEntry}. */ public interface PatchListCache { diff --git a/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java similarity index 95% rename from src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java rename to gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java index bf55c15688..71342ff6f4 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java @@ -14,17 +14,17 @@ package com.google.gerrit.server.patch; -import static com.google.gerrit.client.data.PatchScriptSettings.Whitespace.IGNORE_NONE; +import static com.google.gerrit.common.data.PatchScriptSettings.Whitespace.IGNORE_NONE; -import com.google.gerrit.client.data.PatchScriptSettings.Whitespace; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.git.GitRepositoryManager; +import com.google.gerrit.common.data.PatchScriptSettings.Whitespace; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Project; import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.cache.EvictionPolicy; import com.google.gerrit.server.cache.SelfPopulatingCache; +import com.google.gerrit.server.git.GitRepositoryManager; import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; diff --git a/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java similarity index 97% rename from src/main/java/com/google/gerrit/server/patch/PatchListEntry.java rename to gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java index a17fc98f11..7e9e89725a 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java @@ -23,10 +23,10 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.writeEnum; import static com.google.gerrit.server.ioutil.BasicSerialization.writeString; import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32; -import com.google.gerrit.client.reviewdb.Patch; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.Patch.ChangeType; -import com.google.gerrit.client.reviewdb.Patch.PatchType; +import com.google.gerrit.reviewdb.Patch; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.Patch.ChangeType; +import com.google.gerrit.reviewdb.Patch.PatchType; import org.eclipse.jgit.diff.Edit; import org.eclipse.jgit.lib.Constants; diff --git a/src/main/java/com/google/gerrit/server/patch/PatchListKey.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java similarity index 96% rename from src/main/java/com/google/gerrit/server/patch/PatchListKey.java rename to gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java index a04139a3fb..a6c0a72ffb 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchListKey.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java @@ -21,8 +21,8 @@ import static org.eclipse.jgit.lib.ObjectIdSerialization.readNotNull; import static org.eclipse.jgit.lib.ObjectIdSerialization.writeCanBeNull; import static org.eclipse.jgit.lib.ObjectIdSerialization.writeNotNull; -import com.google.gerrit.client.data.PatchScriptSettings.Whitespace; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.common.data.PatchScriptSettings.Whitespace; +import com.google.gerrit.reviewdb.Project; import com.google.gerrit.server.config.Nullable; import org.eclipse.jgit.lib.AnyObjectId; diff --git a/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java similarity index 89% rename from src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java rename to gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java index 81c1051900..961717297b 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java @@ -14,15 +14,15 @@ package com.google.gerrit.server.patch; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetInfo; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.UserIdentity; -import com.google.gerrit.git.GitRepositoryManager; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetInfo; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.UserIdentity; import com.google.gerrit.server.account.AccountByEmailCache; +import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/patch/PatchSetInfoNotAvailableException.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoNotAvailableException.java similarity index 100% rename from src/main/java/com/google/gerrit/server/patch/PatchSetInfoNotAvailableException.java rename to gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoNotAvailableException.java diff --git a/src/main/java/com/google/gerrit/server/patch/Text.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java similarity index 95% rename from src/main/java/com/google/gerrit/server/patch/Text.java rename to gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java index c5c3ecb376..4ce13338ab 100644 --- a/src/main/java/com/google/gerrit/server/patch/Text.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.patch; -import com.google.gerrit.client.data.SparseFileContent; +import com.google.gerrit.common.data.SparseFileContent; import org.eclipse.jgit.diff.RawText; import org.eclipse.jgit.lib.Constants; diff --git a/src/main/java/com/google/gerrit/server/project/ChangeControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java similarity index 96% rename from src/main/java/com/google/gerrit/server/project/ChangeControl.java rename to gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java index 6df9b0c91e..fd6fc85d1c 100644 --- a/src/main/java/com/google/gerrit/server/project/ChangeControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.project; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gwtorm.client.OrmException; diff --git a/src/main/java/com/google/gerrit/server/project/NoSuchChangeException.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchChangeException.java similarity index 95% rename from src/main/java/com/google/gerrit/server/project/NoSuchChangeException.java rename to gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchChangeException.java index 00c19c954b..0985bfb729 100644 --- a/src/main/java/com/google/gerrit/server/project/NoSuchChangeException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchChangeException.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.project; -import com.google.gerrit.client.reviewdb.Change; +import com.google.gerrit.reviewdb.Change; /** Indicates the change does not exist. */ public class NoSuchChangeException extends Exception { diff --git a/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java similarity index 95% rename from src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java rename to gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java index 55c7de3155..fca9840c44 100644 --- a/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.project; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Project; /** Indicates the project does not exist. */ public class NoSuchProjectException extends Exception { diff --git a/src/main/java/com/google/gerrit/server/project/ProjectCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java similarity index 95% rename from src/main/java/com/google/gerrit/server/project/ProjectCache.java rename to gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java index 19e174a33f..b5353a54d5 100644 --- a/src/main/java/com/google/gerrit/server/project/ProjectCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.project; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Project; /** Cache of project information, including access rights. */ public interface ProjectCache { diff --git a/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java similarity index 96% rename from src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java rename to gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java index 5e5b97d0ac..389415ac4d 100644 --- a/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.project; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.cache.SelfPopulatingCache; diff --git a/src/main/java/com/google/gerrit/server/project/ProjectControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java similarity index 91% rename from src/main/java/com/google/gerrit/server/project/ProjectControl.java rename to gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java index dcd55b7237..c3e54c9cf6 100644 --- a/src/main/java/com/google/gerrit/server/project/ProjectControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java @@ -14,16 +14,16 @@ package com.google.gerrit.server.project; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD_CREATE; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD_REPLACE; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_TAG; +import static com.google.gerrit.reviewdb.ApprovalCategory.PUSH_HEAD; +import static com.google.gerrit.reviewdb.ApprovalCategory.PUSH_HEAD_CREATE; +import static com.google.gerrit.reviewdb.ApprovalCategory.PUSH_HEAD_REPLACE; +import static com.google.gerrit.reviewdb.ApprovalCategory.PUSH_TAG; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; import com.google.gerrit.server.CurrentUser; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/src/main/java/com/google/gerrit/server/project/ProjectState.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java similarity index 93% rename from src/main/java/com/google/gerrit/server/project/ProjectState.java rename to gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java index f6a168d309..5e827fbdc3 100644 --- a/src/main/java/com/google/gerrit/server/project/ProjectState.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.project; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; import com.google.gerrit.server.AnonymousUser; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.config.WildProjectName; diff --git a/src/main/java/com/google/gerrit/server/query/AndPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/AndPredicate.java similarity index 100% rename from src/main/java/com/google/gerrit/server/query/AndPredicate.java rename to gerrit-server/src/main/java/com/google/gerrit/server/query/AndPredicate.java diff --git a/src/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java similarity index 98% rename from src/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java rename to gerrit-server/src/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java index 2b4a6b95e2..b12b56d8ae 100644 --- a/src/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.query; -import com.google.gerrit.client.reviewdb.RevId; +import com.google.gerrit.reviewdb.RevId; import com.google.inject.Singleton; import org.eclipse.jgit.lib.AbbreviatedObjectId; diff --git a/src/main/java/com/google/gerrit/server/query/NotPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/NotPredicate.java similarity index 100% rename from src/main/java/com/google/gerrit/server/query/NotPredicate.java rename to gerrit-server/src/main/java/com/google/gerrit/server/query/NotPredicate.java diff --git a/src/main/java/com/google/gerrit/server/query/ObjectIdPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/ObjectIdPredicate.java similarity index 100% rename from src/main/java/com/google/gerrit/server/query/ObjectIdPredicate.java rename to gerrit-server/src/main/java/com/google/gerrit/server/query/ObjectIdPredicate.java diff --git a/src/main/java/com/google/gerrit/server/query/OperatorPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/OperatorPredicate.java similarity index 100% rename from src/main/java/com/google/gerrit/server/query/OperatorPredicate.java rename to gerrit-server/src/main/java/com/google/gerrit/server/query/OperatorPredicate.java diff --git a/src/main/java/com/google/gerrit/server/query/OrPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/OrPredicate.java similarity index 100% rename from src/main/java/com/google/gerrit/server/query/OrPredicate.java rename to gerrit-server/src/main/java/com/google/gerrit/server/query/OrPredicate.java diff --git a/src/main/java/com/google/gerrit/server/query/Predicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java similarity index 100% rename from src/main/java/com/google/gerrit/server/query/Predicate.java rename to gerrit-server/src/main/java/com/google/gerrit/server/query/Predicate.java diff --git a/src/main/java/com/google/gerrit/server/query/QueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java similarity index 100% rename from src/main/java/com/google/gerrit/server/query/QueryBuilder.java rename to gerrit-server/src/main/java/com/google/gerrit/server/query/QueryBuilder.java diff --git a/src/main/java/com/google/gerrit/server/query/QueryParseException.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/QueryParseException.java similarity index 100% rename from src/main/java/com/google/gerrit/server/query/QueryParseException.java rename to gerrit-server/src/main/java/com/google/gerrit/server/query/QueryParseException.java diff --git a/src/main/java/com/google/gerrit/server/ssh/SshInfo.java b/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshInfo.java similarity index 77% rename from src/main/java/com/google/gerrit/server/ssh/SshInfo.java rename to gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshInfo.java index 37e15843d6..0081cb4431 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshInfo.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshInfo.java @@ -14,14 +14,10 @@ package com.google.gerrit.server.ssh; -import java.net.InetSocketAddress; -import java.security.PublicKey; -import java.util.Collection; +import com.jcraft.jsch.HostKey; + +import java.util.List; public interface SshInfo { - InetSocketAddress getAddress(); - - Collection getHostKeys(); - - String getSshdAddress(); + List getHostKeys(); } diff --git a/src/main/java/com/google/gerrit/server/ssh/SshKeyCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshKeyCache.java similarity index 71% rename from src/main/java/com/google/gerrit/server/ssh/SshKeyCache.java rename to gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshKeyCache.java index ec33fb4374..b56405afb8 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshKeyCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshKeyCache.java @@ -14,9 +14,13 @@ package com.google.gerrit.server.ssh; -/** Provides the {@link SshKeyCacheEntry}. */ -public interface SshKeyCache { - public Iterable get(String username); +import com.google.gerrit.common.errors.InvalidSshKeyException; +import com.google.gerrit.reviewdb.AccountSshKey; +/** Permits controlling the contents of the SSH key cache area. */ +public interface SshKeyCache { public void evict(String username); + + public AccountSshKey create(AccountSshKey.Id id, String encoded) + throws InvalidSshKeyException; } diff --git a/src/main/java/com/google/gerrit/server/workflow/CategoryFunction.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/CategoryFunction.java similarity index 93% rename from src/main/java/com/google/gerrit/server/workflow/CategoryFunction.java rename to gerrit-server/src/main/java/com/google/gerrit/server/workflow/CategoryFunction.java index b92ac573c1..38a9fd4730 100644 --- a/src/main/java/com/google/gerrit/server/workflow/CategoryFunction.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/CategoryFunction.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.ProjectRight; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.ProjectRight; import com.google.gerrit.server.CurrentUser; import java.util.HashMap; diff --git a/src/main/java/com/google/gerrit/server/workflow/FunctionState.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/FunctionState.java similarity index 93% rename from src/main/java/com/google/gerrit/server/workflow/FunctionState.java rename to gerrit-server/src/main/java/com/google/gerrit/server/workflow/FunctionState.java index ed8cb9b353..69f571d47c 100644 --- a/src/main/java/com/google/gerrit/server/workflow/FunctionState.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/FunctionState.java @@ -14,17 +14,17 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; -import com.google.gerrit.client.reviewdb.ApprovalCategory.Id; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.ApprovalCategory.Id; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.project.ProjectCache; diff --git a/src/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java similarity index 93% rename from src/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java rename to gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java index 759d50e66b..7bf7e9bcbe 100644 --- a/src/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java @@ -14,9 +14,9 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.PatchSetApproval; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.PatchSetApproval; /** * Computes an {@link ApprovalCategory} by looking at maximum values. diff --git a/src/main/java/com/google/gerrit/server/workflow/NoOpFunction.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoOpFunction.java similarity index 95% rename from src/main/java/com/google/gerrit/server/workflow/NoOpFunction.java rename to gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoOpFunction.java index 1969128960..6d2c26cd10 100644 --- a/src/main/java/com/google/gerrit/server/workflow/NoOpFunction.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoOpFunction.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.client.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalType; import com.google.gerrit.server.CurrentUser; /** A function that does nothing. */ diff --git a/src/main/java/com/google/gerrit/server/workflow/SubmitFunction.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/SubmitFunction.java similarity index 90% rename from src/main/java/com/google/gerrit/server/workflow/SubmitFunction.java rename to gerrit-server/src/main/java/com/google/gerrit/server/workflow/SubmitFunction.java index ac935c5094..b9805796f2 100644 --- a/src/main/java/com/google/gerrit/server/workflow/SubmitFunction.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/SubmitFunction.java @@ -14,10 +14,10 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ProjectRight; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ProjectRight; import com.google.gerrit.server.CurrentUser; /** diff --git a/src/test/java/com/google/gerrit/server/ParamertizedStringTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/ParamertizedStringTest.java similarity index 100% rename from src/test/java/com/google/gerrit/server/ParamertizedStringTest.java rename to gerrit-server/src/test/java/com/google/gerrit/server/ParamertizedStringTest.java diff --git a/src/test/java/com/google/gerrit/server/config/SystemConfigProviderTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/config/SystemConfigProviderTest.java similarity index 96% rename from src/test/java/com/google/gerrit/server/config/SystemConfigProviderTest.java rename to gerrit-server/src/test/java/com/google/gerrit/server/config/SystemConfigProviderTest.java index c1fce7b042..6a1777c19f 100644 --- a/src/test/java/com/google/gerrit/server/config/SystemConfigProviderTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/config/SystemConfigProviderTest.java @@ -14,14 +14,14 @@ package com.google.gerrit.server.config; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.SchemaVersion; -import com.google.gerrit.client.reviewdb.SystemConfig; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.SchemaVersion; +import com.google.gerrit.reviewdb.SystemConfig; import com.google.gerrit.server.workflow.NoOpFunction; import com.google.gerrit.server.workflow.SubmitFunction; import com.google.gerrit.testutil.TestDatabase; diff --git a/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java similarity index 100% rename from src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java rename to gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java diff --git a/src/test/java/com/google/gerrit/server/mail/AddressTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java similarity index 100% rename from src/test/java/com/google/gerrit/server/mail/AddressTest.java rename to gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java diff --git a/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java similarity index 98% rename from src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java rename to gerrit-server/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java index 81422ab613..f819dacdca 100644 --- a/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java @@ -20,9 +20,9 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountExternalId; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountExternalId; +import com.google.gerrit.reviewdb.AccountGroup; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; diff --git a/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java similarity index 95% rename from src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java rename to gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java index 270c5a9494..24f6f632b3 100644 --- a/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.patch; -import com.google.gerrit.client.reviewdb.Patch; +import com.google.gerrit.reviewdb.Patch; import junit.framework.TestCase; diff --git a/src/test/java/com/google/gerrit/server/query/ChangeQueryBuilderTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/ChangeQueryBuilderTest.java similarity index 100% rename from src/test/java/com/google/gerrit/server/query/ChangeQueryBuilderTest.java rename to gerrit-server/src/test/java/com/google/gerrit/server/query/ChangeQueryBuilderTest.java diff --git a/src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java similarity index 100% rename from src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java rename to gerrit-server/src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java diff --git a/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java similarity index 100% rename from src/test/java/com/google/gerrit/server/query/NotPredicateTest.java rename to gerrit-server/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java diff --git a/src/test/java/com/google/gerrit/server/query/QueryParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java similarity index 100% rename from src/test/java/com/google/gerrit/server/query/QueryParserTest.java rename to gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java diff --git a/src/test/java/com/google/gerrit/testutil/TestDatabase.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/TestDatabase.java similarity index 98% rename from src/test/java/com/google/gerrit/testutil/TestDatabase.java rename to gerrit-server/src/test/java/com/google/gerrit/testutil/TestDatabase.java index d628403c4f..7dc504fc5f 100644 --- a/src/test/java/com/google/gerrit/testutil/TestDatabase.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/TestDatabase.java @@ -14,7 +14,7 @@ package com.google.gerrit.testutil; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.config.SystemConfigProvider; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; diff --git a/gerrit-sshd/.gitignore b/gerrit-sshd/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-sshd/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-sshd/.settings/org.eclipse.core.resources.prefs b/gerrit-sshd/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-sshd/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-sshd/.settings/org.eclipse.core.runtime.prefs b/gerrit-sshd/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-sshd/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-sshd/.settings/org.eclipse.jdt.core.prefs b/gerrit-sshd/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-sshd/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-sshd/.settings/org.eclipse.jdt.ui.prefs b/gerrit-sshd/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-sshd/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-sshd/pom.xml b/gerrit-sshd/pom.xml new file mode 100644 index 0000000000..d24e097166 --- /dev/null +++ b/gerrit-sshd/pom.xml @@ -0,0 +1,61 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-sshd + Gerrit Code Review - SSHd + + + Java SSH daemon with Gerrit commands and Git support + + + + + org.apache.sshd + sshd-core + + + + org.slf4j + slf4j-api + + + + com.google.gerrit + gerrit-util-cli + + + + com.google.gerrit + gerrit-server + + + + + + + + diff --git a/src/main/java/com/google/gerrit/server/ssh/AdminCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AdminCommand.java similarity index 96% rename from src/main/java/com/google/gerrit/server/ssh/AdminCommand.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/AdminCommand.java index e8b5fdb7bc..adaf6466fa 100644 --- a/src/main/java/com/google/gerrit/server/ssh/AdminCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AdminCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/main/java/com/google/gerrit/server/ssh/BaseCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java similarity index 98% rename from src/main/java/com/google/gerrit/server/ssh/BaseCommand.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java index ab6254466e..060f8f82d0 100644 --- a/src/main/java/com/google/gerrit/server/ssh/BaseCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.pgm.CmdLineParser; +import com.google.gerrit.reviewdb.Account; import com.google.gerrit.server.RequestCleanup; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.NoSuchProjectException; -import com.google.gerrit.server.ssh.SshScopes.Context; +import com.google.gerrit.sshd.SshScopes.Context; +import com.google.gerrit.util.cli.CmdLineParser; import com.google.inject.Inject; import org.apache.sshd.common.SshException; diff --git a/src/main/java/com/google/gerrit/server/ssh/CommandFactoryProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java similarity index 96% rename from src/main/java/com/google/gerrit/server/ssh/CommandFactoryProvider.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java index 09dce87be9..53279c88b2 100644 --- a/src/main/java/com/google/gerrit/server/ssh/CommandFactoryProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; -import com.google.gerrit.server.ssh.SshScopes.Context; +import com.google.gerrit.sshd.SshScopes.Context; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/src/main/java/com/google/gerrit/server/ssh/CommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java similarity index 98% rename from src/main/java/com/google/gerrit/server/ssh/CommandModule.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java index 5bb639b7a2..857e118a8d 100644 --- a/src/main/java/com/google/gerrit/server/ssh/CommandModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; import com.google.inject.AbstractModule; import com.google.inject.binder.LinkedBindingBuilder; diff --git a/src/main/java/com/google/gerrit/server/ssh/CommandName.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandName.java similarity index 96% rename from src/main/java/com/google/gerrit/server/ssh/CommandName.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandName.java index 10cd5e1353..09503bb3ee 100644 --- a/src/main/java/com/google/gerrit/server/ssh/CommandName.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandName.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/src/main/java/com/google/gerrit/server/ssh/Commands.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java similarity index 99% rename from src/main/java/com/google/gerrit/server/ssh/Commands.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java index 25d7ed2b60..86b3522711 100644 --- a/src/main/java/com/google/gerrit/server/ssh/Commands.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; import com.google.inject.Key; diff --git a/src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java similarity index 90% rename from src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java index afb82b0789..45d4ab2009 100644 --- a/src/main/java/com/google/gerrit/server/ssh/DatabasePubKeyAuth.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; -import com.google.gerrit.client.reviewdb.AccountSshKey; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.AccountSshKey; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gwtorm.client.SchemaFactory; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -34,11 +34,11 @@ import java.security.PublicKey; */ @Singleton class DatabasePubKeyAuth implements PublickeyAuthenticator { - private final SshKeyCache sshKeyCache; + private final SshKeyCacheImpl sshKeyCache; private final SchemaFactory schema; @Inject - DatabasePubKeyAuth(final SshKeyCache skc, final SchemaFactory sf) { + DatabasePubKeyAuth(final SshKeyCacheImpl skc, final SchemaFactory sf) { sshKeyCache = skc; schema = sf; } diff --git a/src/main/java/com/google/gerrit/server/ssh/DispatchCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java similarity index 99% rename from src/main/java/com/google/gerrit/server/ssh/DispatchCommand.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java index aac3d5f63a..7ff527b1c5 100644 --- a/src/main/java/com/google/gerrit/server/ssh/DispatchCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; import com.google.gerrit.server.CurrentUser; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/ssh/DispatchCommandProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java similarity index 98% rename from src/main/java/com/google/gerrit/server/ssh/DispatchCommandProvider.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java index 9372cabf15..abd2a218e3 100644 --- a/src/main/java/com/google/gerrit/server/ssh/DispatchCommandProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; import com.google.inject.Binding; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/ssh/HostKeyProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java similarity index 98% rename from src/main/java/com/google/gerrit/server/ssh/HostKeyProvider.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java index 420bd608ff..db84cb79ac 100644 --- a/src/main/java/com/google/gerrit/server/ssh/HostKeyProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; import com.google.gerrit.server.config.SitePath; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/ssh/NoShell.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java similarity index 85% rename from src/main/java/com/google/gerrit/server/ssh/NoShell.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java index b2bf8ce7b0..5cf9cb7681 100644 --- a/src/main/java/com/google/gerrit/server/ssh/NoShell.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java @@ -12,9 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; - -import com.google.gerrit.server.http.SshServlet; +package com.google.gerrit.sshd; import org.apache.sshd.server.ShellFactory; import org.eclipse.jgit.lib.Constants; @@ -26,9 +24,9 @@ import java.io.OutputStream; /** * Dummy shell which prints a message and terminates. *

- * This implementation is used by {@link SshServlet} to ensure clients who try - * to SSH directly to this server without supplying a command will get a - * reasonable error message, but cannot continue further. + * This implementation is used to ensure clients who try to SSH directly to this + * server without supplying a command will get a reasonable error message, but + * cannot continue further. */ class NoShell implements ShellFactory { public Shell createShell() { diff --git a/src/main/java/com/google/gerrit/server/ssh/SshCurrentUserProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshCurrentUserProvider.java similarity index 90% rename from src/main/java/com/google/gerrit/server/ssh/SshCurrentUserProvider.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshCurrentUserProvider.java index 1a7a7ddebc..9a0b233474 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshCurrentUserProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshCurrentUserProvider.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; import com.google.gerrit.server.AccessPath; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.ssh.SshScopes.Context; +import com.google.gerrit.sshd.SshScopes.Context; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.ProvisionException; diff --git a/src/main/java/com/google/gerrit/server/ssh/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java similarity index 89% rename from src/main/java/com/google/gerrit/server/ssh/SshDaemon.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java index 0e474d9899..3477b536f6 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshDaemon.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java @@ -12,13 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; import com.google.gerrit.server.config.GerritServerConfig; +import com.google.gerrit.server.ssh.SshInfo; import com.google.inject.Inject; import com.google.inject.Key; import com.google.inject.Singleton; +import com.jcraft.jsch.HostKey; +import com.jcraft.jsch.JSchException; + import org.apache.mina.core.service.IoAcceptor; import org.apache.mina.core.session.IoSession; import org.apache.mina.transport.socket.SocketSessionConfig; @@ -46,6 +50,7 @@ import org.apache.sshd.common.random.JceRandom; import org.apache.sshd.common.random.SingletonRandomFactory; import org.apache.sshd.common.signature.SignatureDSA; import org.apache.sshd.common.signature.SignatureRSA; +import org.apache.sshd.common.util.Buffer; import org.apache.sshd.common.util.SecurityUtils; import org.apache.sshd.server.CommandFactory; import org.apache.sshd.server.PublickeyAuthenticator; @@ -58,9 +63,9 @@ import org.apache.sshd.server.channel.ChannelSession; import org.apache.sshd.server.kex.DHG1; import org.apache.sshd.server.kex.DHG14; import org.apache.sshd.server.session.ServerSession; +import org.eclipse.jgit.lib.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.eclipse.jgit.lib.Config; import java.io.IOException; import java.net.Inet6Address; @@ -99,6 +104,7 @@ import java.util.List; */ @Singleton public class SshDaemon extends SshServer implements SshInfo { + private static final int IANA_SSH_PORT = 22; private static final int DEFAULT_PORT = 29418; private static final Logger log = LoggerFactory.getLogger(SshDaemon.class); @@ -110,6 +116,8 @@ public class SshDaemon extends SshServer implements SshInfo { String host; if (hostAddr.isAnyLocalAddress()) { host = "*"; + } else if (inetAddr.getPort() == IANA_SSH_PORT && !isIPv6(hostAddr)) { + return inetAddr.getHostName(); } else { host = "[" + hostAddr.getHostName() + "]"; } @@ -124,10 +132,9 @@ public class SshDaemon extends SshServer implements SshInfo { } private final List listen; - private final InetSocketAddress preferredAddress; private final boolean reuseAddress; private final boolean keepAlive; - private final Collection hostKeys; + private final List hostKeys; private volatile IoAcceptor acceptor; @Inject @@ -135,7 +142,7 @@ public class SshDaemon extends SshServer implements SshInfo { final PublickeyAuthenticator userAuth, final KeyPairProvider hostKeyProvider, @GerritServerConfig final Config cfg) { - setPort(22/* never used */); + setPort(IANA_SSH_PORT /* never used */); listen = parseListen(cfg); reuseAddress = cfg.getBoolean("sshd", "reuseaddress", true); @@ -173,38 +180,13 @@ public class SshDaemon extends SshServer implements SshInfo { }); hostKeys = computeHostKeys(); - preferredAddress = computePreferredAddress(); } @Override - public Collection getHostKeys() { + public List getHostKeys() { return hostKeys; } - @Override - public InetSocketAddress getAddress() { - return preferredAddress; - } - - public String getSshdAddress() { - if (preferredAddress != null) { - final InetAddress ip = preferredAddress.getAddress(); - String host; - if (ip != null && ip.isAnyLocalAddress()) { - host = ""; - } else if (isIPv6(ip)) { - host = "[" + preferredAddress.getHostName() + "]"; - } else { - host = preferredAddress.getHostName(); - } - if (preferredAddress.getPort() != 22) { - host += ":" + preferredAddress.getPort(); - } - return host; - } - return null; - } - public IoAcceptor getIoAcceptor() { return acceptor; } @@ -213,9 +195,6 @@ public class SshDaemon extends SshServer implements SshInfo { public synchronized void start() throws IOException { if (acceptor == null) { checkConfig(); - if (hostKeys.isEmpty()) { - throw new IOException("No SSHD host key"); - } final NioSocketAcceptor ain = new NioSocketAcceptor(); final SessionFactory handler = getSessionFactory(); @@ -241,12 +220,48 @@ public class SshDaemon extends SshServer implements SshInfo { } } - private Collection computeHostKeys() { + @Override + protected void checkConfig() { + super.checkConfig(); + if (myHostKeys().isEmpty()) { + throw new IllegalStateException("No SSHD host key"); + } + } + + private List computeHostKeys() { + final List keys = myHostKeys(); + final ArrayList r = new ArrayList(); + for (final PublicKey pub : keys) { + final Buffer buf = new Buffer(); + buf.putPublicKey(pub); + final byte[] keyBin = buf.getCompactData(); + + for (final SocketAddress addr : listen) { + if (!(addr instanceof InetSocketAddress)) { + continue; + } + + final InetSocketAddress inetAddr = (InetSocketAddress) addr; + if (inetAddr.getAddress().isLoopbackAddress()) { + continue; + } + + try { + r.add(new HostKey(format(inetAddr), keyBin)); + } catch (JSchException e) { + log.warn("Cannot format SSHD host key", e); + } + } + } + return Collections.unmodifiableList(r); + } + + private List myHostKeys() { final KeyPairProvider p = getKeyPairProvider(); final List keys = new ArrayList(2); - addPublicKey(keys, p, KeyPairProvider.SSH_DSS); addPublicKey(keys, p, KeyPairProvider.SSH_RSA); - return Collections.unmodifiableList(keys); + addPublicKey(keys, p, KeyPairProvider.SSH_DSS); + return keys; } private static void addPublicKey(final Collection out, @@ -257,32 +272,6 @@ public class SshDaemon extends SshServer implements SshInfo { } } - private InetSocketAddress computePreferredAddress() { - for (final SocketAddress addr : listen) { - if (!(addr instanceof InetSocketAddress)) { - continue; - } - - InetSocketAddress inetAddr = (InetSocketAddress) addr; - if (inetAddr.getAddress().isLoopbackAddress()) { - continue; - } - return inetAddr; - } - - // No non-loopback address available? Try any address then. - // - for (final SocketAddress addr : listen) { - if (addr instanceof InetSocketAddress) { - return (InetSocketAddress) addr; - } - } - - // We give up, with no valid address. - // - return null; - } - private String addressList() { final StringBuilder r = new StringBuilder(); for (Iterator i = listen.iterator(); i.hasNext();) { @@ -309,7 +298,6 @@ public class SshDaemon extends SshServer implements SshInfo { log.error("Bad sshd.listenaddress: " + desc + ": " + e.getMessage()); } } - return bind; } diff --git a/src/main/java/com/google/gerrit/server/ssh/SshKeyCacheEntry.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java similarity index 89% rename from src/main/java/com/google/gerrit/server/ssh/SshKeyCacheEntry.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java index 2daf1847c6..85bb382422 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshKeyCacheEntry.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountSshKey; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountSshKey; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; diff --git a/src/main/java/com/google/gerrit/server/ssh/SshKeyCacheImpl.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheImpl.java similarity index 78% rename from src/main/java/com/google/gerrit/server/ssh/SshKeyCacheImpl.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheImpl.java index c22b231ed7..d51d6f9392 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshKeyCacheImpl.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheImpl.java @@ -12,14 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountSshKey; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.common.errors.InvalidSshKeyException; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountSshKey; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.cache.Cache; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.cache.SelfPopulatingCache; +import com.google.gerrit.server.ssh.SshKeyCache; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.SchemaFactory; import com.google.inject.Inject; @@ -31,6 +33,9 @@ import com.google.inject.name.Named; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.spec.InvalidKeySpecException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -38,7 +43,8 @@ import java.util.List; /** Provides the {@link SshKeyCacheEntry}. */ @Singleton public class SshKeyCacheImpl implements SshKeyCache { - private static final Logger log = LoggerFactory.getLogger(SshKeyCacheImpl.class); + private static final Logger log = + LoggerFactory.getLogger(SshKeyCacheImpl.class); private static final String CACHE_NAME = "sshkeys"; public static Module module() { @@ -83,6 +89,26 @@ public class SshKeyCacheImpl implements SshKeyCache { self.remove(username); } + @Override + public AccountSshKey create(AccountSshKey.Id id, String encoded) + throws InvalidSshKeyException { + try { + final AccountSshKey key = + new AccountSshKey(id, SshUtil.toOpenSshPublicKey(encoded)); + SshUtil.parse(key); + return key; + } catch (NoSuchAlgorithmException e) { + throw new InvalidSshKeyException(); + + } catch (InvalidKeySpecException e) { + throw new InvalidSshKeyException(); + + } catch (NoSuchProviderException e) { + log.error("Cannot parse SSH key", e); + throw new InvalidSshKeyException(); + } + } + private Iterable lookup(final String username) throws Exception { final ReviewDb db = schema.open(); diff --git a/src/main/java/com/google/gerrit/server/ssh/SshModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java similarity index 85% rename from src/main/java/com/google/gerrit/server/ssh/SshModule.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java index e04486f451..59d0c32eb3 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java @@ -12,27 +12,28 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; import static com.google.inject.Scopes.SINGLETON; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.pgm.CmdLineParser; -import com.google.gerrit.pgm.OptionHandlerFactory; -import com.google.gerrit.pgm.OptionHandlerUtil; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.PatchSet; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.RemotePeer; import com.google.gerrit.server.config.FactoryModule; import com.google.gerrit.server.config.GerritRequestModule; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.ssh.args4j.AccountGroupIdHandler; -import com.google.gerrit.server.ssh.args4j.AccountIdHandler; -import com.google.gerrit.server.ssh.args4j.PatchSetIdHandler; -import com.google.gerrit.server.ssh.args4j.ProjectControlHandler; -import com.google.gerrit.server.ssh.commands.DefaultCommandModule; +import com.google.gerrit.server.ssh.SshInfo; +import com.google.gerrit.sshd.args4j.AccountGroupIdHandler; +import com.google.gerrit.sshd.args4j.AccountIdHandler; +import com.google.gerrit.sshd.args4j.PatchSetIdHandler; +import com.google.gerrit.sshd.args4j.ProjectControlHandler; +import com.google.gerrit.sshd.commands.DefaultCommandModule; +import com.google.gerrit.util.cli.CmdLineParser; +import com.google.gerrit.util.cli.OptionHandlerFactory; +import com.google.gerrit.util.cli.OptionHandlerUtil; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.TypeLiteral; @@ -62,6 +63,7 @@ public class SshModule extends FactoryModule { configureRequestScope(); configureCmdLineParser(); + install(SshKeyCacheImpl.module()); bind(SshInfo.class).to(SshDaemon.class).in(SINGLETON); factory(DispatchCommand.Factory.class); diff --git a/src/main/java/com/google/gerrit/server/ssh/SshScopes.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScopes.java similarity index 98% rename from src/main/java/com/google/gerrit/server/ssh/SshScopes.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScopes.java index 18b1e5cf24..ede05b1bef 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshScopes.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScopes.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; import com.google.inject.Key; import com.google.inject.OutOfScopeException; diff --git a/src/main/java/com/google/gerrit/server/ssh/SshUtil.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java similarity index 96% rename from src/main/java/com/google/gerrit/server/ssh/SshUtil.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java index 78bea6caca..df500a906d 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshUtil.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh; +package com.google.gerrit.sshd; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountSshKey; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountSshKey; import org.apache.commons.codec.binary.Base64; import org.apache.sshd.common.KeyPairProvider; diff --git a/src/main/java/com/google/gerrit/server/ssh/args4j/AccountGroupIdHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupIdHandler.java similarity index 94% rename from src/main/java/com/google/gerrit/server/ssh/args4j/AccountGroupIdHandler.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupIdHandler.java index 63be4a5bd0..7966142b10 100644 --- a/src/main/java/com/google/gerrit/server/ssh/args4j/AccountGroupIdHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountGroupIdHandler.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.args4j; +package com.google.gerrit.sshd.args4j; -import com.google.gerrit.client.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroup; import com.google.gerrit.server.account.GroupCache; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/ssh/args4j/AccountIdHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountIdHandler.java similarity index 95% rename from src/main/java/com/google/gerrit/server/ssh/args4j/AccountIdHandler.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountIdHandler.java index 926d93435c..fe74271e11 100644 --- a/src/main/java/com/google/gerrit/server/ssh/args4j/AccountIdHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/AccountIdHandler.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.args4j; +package com.google.gerrit.sshd.args4j; -import com.google.gerrit.client.reviewdb.Account; +import com.google.gerrit.reviewdb.Account; import com.google.gerrit.server.account.AccountResolver; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/ssh/args4j/PatchSetIdHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/PatchSetIdHandler.java similarity index 94% rename from src/main/java/com/google/gerrit/server/ssh/args4j/PatchSetIdHandler.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/PatchSetIdHandler.java index 32ede0ecc8..5b24ce5d46 100644 --- a/src/main/java/com/google/gerrit/server/ssh/args4j/PatchSetIdHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/PatchSetIdHandler.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.args4j; +package com.google.gerrit.sshd.args4j; -import com.google.gerrit.client.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSet; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/src/main/java/com/google/gerrit/server/ssh/args4j/ProjectControlHandler.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/ProjectControlHandler.java similarity index 96% rename from src/main/java/com/google/gerrit/server/ssh/args4j/ProjectControlHandler.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/ProjectControlHandler.java index 72e9e06ed7..4c962f04da 100644 --- a/src/main/java/com/google/gerrit/server/ssh/args4j/ProjectControlHandler.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/args4j/ProjectControlHandler.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.args4j; +package com.google.gerrit.sshd.args4j; -import com.google.gerrit.client.reviewdb.Project; +import com.google.gerrit.reviewdb.Project; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/AbstractGitCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AbstractGitCommand.java similarity index 90% rename from src/main/java/com/google/gerrit/server/ssh/commands/AbstractGitCommand.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AbstractGitCommand.java index 9a02e940d9..8193c61b22 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/AbstractGitCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AbstractGitCommand.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.git.GitRepositoryManager; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.ssh.BaseCommand; +import com.google.gerrit.sshd.BaseCommand; import com.google.inject.Inject; import org.kohsuke.args4j.Argument; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/AdminCreateProject.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminCreateProject.java similarity index 88% rename from src/main/java/com/google/gerrit/server/ssh/commands/AdminCreateProject.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminCreateProject.java index 1c76b05af3..b8e1ccc8e0 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/AdminCreateProject.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminCreateProject.java @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ProjectRight; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.reviewdb.Project.SubmitType; -import com.google.gerrit.git.GitRepositoryManager; -import com.google.gerrit.git.ReplicationQueue; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ProjectRight; +import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Project.SubmitType; import com.google.gerrit.server.config.AuthConfig; -import com.google.gerrit.server.ssh.AdminCommand; -import com.google.gerrit.server.ssh.BaseCommand; +import com.google.gerrit.server.git.GitRepositoryManager; +import com.google.gerrit.server.git.ReplicationQueue; +import com.google.gerrit.sshd.AdminCommand; +import com.google.gerrit.sshd.BaseCommand; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.Transaction; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/AdminFlushCaches.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminFlushCaches.java similarity index 96% rename from src/main/java/com/google/gerrit/server/ssh/commands/AdminFlushCaches.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminFlushCaches.java index aba48bd303..8f44595418 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/AdminFlushCaches.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminFlushCaches.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.server.ssh.AdminCommand; +import com.google.gerrit.sshd.AdminCommand; import net.sf.ehcache.Ehcache; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/AdminReplicate.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminReplicate.java similarity index 89% rename from src/main/java/com/google/gerrit/server/ssh/commands/AdminReplicate.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminReplicate.java index efb66e6cdf..3f131c6e2c 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/AdminReplicate.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminReplicate.java @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.git.PushAllProjectsOp; -import com.google.gerrit.git.ReplicationQueue; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.server.git.PushAllProjectsOp; +import com.google.gerrit.server.git.ReplicationQueue; import com.google.gerrit.server.project.ProjectCache; -import com.google.gerrit.server.ssh.AdminCommand; -import com.google.gerrit.server.ssh.BaseCommand; +import com.google.gerrit.sshd.AdminCommand; +import com.google.gerrit.sshd.BaseCommand; import com.google.inject.Inject; import org.kohsuke.args4j.Argument; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/AdminShowCaches.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminShowCaches.java similarity index 98% rename from src/main/java/com/google/gerrit/server/ssh/commands/AdminShowCaches.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminShowCaches.java index 1f2a6bd8be..c865f7d7d7 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/AdminShowCaches.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminShowCaches.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.server.ssh.AdminCommand; +import com.google.gerrit.sshd.AdminCommand; import net.sf.ehcache.Ehcache; import net.sf.ehcache.Statistics; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/AdminShowConnections.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminShowConnections.java similarity index 94% rename from src/main/java/com/google/gerrit/server/ssh/commands/AdminShowConnections.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminShowConnections.java index 767935d1b6..ff19e4bcc7 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/AdminShowConnections.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminShowConnections.java @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.server.ssh.AdminCommand; -import com.google.gerrit.server.ssh.BaseCommand; -import com.google.gerrit.server.ssh.SshDaemon; -import com.google.gerrit.server.ssh.SshUtil; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.sshd.AdminCommand; +import com.google.gerrit.sshd.BaseCommand; +import com.google.gerrit.sshd.SshDaemon; +import com.google.gerrit.sshd.SshUtil; import com.google.inject.Inject; import org.apache.mina.core.service.IoAcceptor; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/AdminShowQueue.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminShowQueue.java similarity index 93% rename from src/main/java/com/google/gerrit/server/ssh/commands/AdminShowQueue.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminShowQueue.java index 7f1373e21f..5f8741749f 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/AdminShowQueue.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminShowQueue.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.git.WorkQueue; -import com.google.gerrit.git.WorkQueue.Task; -import com.google.gerrit.server.ssh.AdminCommand; -import com.google.gerrit.server.ssh.BaseCommand; +import com.google.gerrit.server.git.WorkQueue; +import com.google.gerrit.server.git.WorkQueue.Task; +import com.google.gerrit.sshd.AdminCommand; +import com.google.gerrit.sshd.BaseCommand; import com.google.inject.Inject; import java.io.PrintWriter; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/ApproveCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveCommand.java similarity index 93% rename from src/main/java/com/google/gerrit/server/ssh/commands/ApproveCommand.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveCommand.java index e8bd08006b..e8fca51567 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/ApproveCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveCommand.java @@ -12,19 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeMessage; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.RevId; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.pgm.CmdLineParser; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.RevId; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.mail.CommentSender; @@ -34,8 +33,9 @@ import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.ProjectControl; -import com.google.gerrit.server.ssh.BaseCommand; import com.google.gerrit.server.workflow.FunctionState; +import com.google.gerrit.sshd.BaseCommand; +import com.google.gerrit.util.cli.CmdLineParser; import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.ResultSet; import com.google.gwtorm.client.Transaction; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/ApproveOption.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java similarity index 93% rename from src/main/java/com/google/gerrit/server/ssh/commands/ApproveOption.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java index 731ca1cc6c..cc23d1d254 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/ApproveOption.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.ApprovalCategoryValue; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.ApprovalCategoryValue; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/CacheCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CacheCommand.java similarity index 94% rename from src/main/java/com/google/gerrit/server/ssh/commands/CacheCommand.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CacheCommand.java index 2e7e8d146a..313b9dc3df 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/CacheCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CacheCommand.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; import com.google.gerrit.server.cache.CachePool; -import com.google.gerrit.server.ssh.BaseCommand; +import com.google.gerrit.sshd.BaseCommand; import com.google.inject.Inject; import net.sf.ehcache.CacheManager; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/DefaultCommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java similarity index 89% rename from src/main/java/com/google/gerrit/server/ssh/commands/DefaultCommandModule.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java index 19cbf90a62..36de24324f 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/DefaultCommandModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.server.ssh.CommandModule; -import com.google.gerrit.server.ssh.CommandName; -import com.google.gerrit.server.ssh.Commands; -import com.google.gerrit.server.ssh.DispatchCommandProvider; +import com.google.gerrit.sshd.CommandModule; +import com.google.gerrit.sshd.CommandName; +import com.google.gerrit.sshd.Commands; +import com.google.gerrit.sshd.DispatchCommandProvider; /** Register the basic commands any Gerrit server should support. */ diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/ErrorSlaveMode.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ErrorSlaveMode.java similarity index 92% rename from src/main/java/com/google/gerrit/server/ssh/commands/ErrorSlaveMode.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ErrorSlaveMode.java index 3226b863ae..a008b6b309 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/ErrorSlaveMode.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ErrorSlaveMode.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.server.ssh.BaseCommand; +import com.google.gerrit.sshd.BaseCommand; import java.io.IOException; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/ListProjects.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjects.java similarity index 91% rename from src/main/java/com/google/gerrit/server/ssh/commands/ListProjects.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjects.java index 3274464811..b5d2b50b8f 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/ListProjects.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjects.java @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.client.reviewdb.Project; -import com.google.gerrit.client.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.Project; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.WildProjectName; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; -import com.google.gerrit.server.ssh.BaseCommand; +import com.google.gerrit.sshd.BaseCommand; import com.google.gwtorm.client.OrmException; import com.google.inject.Inject; diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/MasterCommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java similarity index 84% rename from src/main/java/com/google/gerrit/server/ssh/commands/MasterCommandModule.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java index 47e056f32e..fd0ad50668 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/MasterCommandModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/MasterCommandModule.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.server.ssh.CommandModule; -import com.google.gerrit.server.ssh.CommandName; -import com.google.gerrit.server.ssh.Commands; +import com.google.gerrit.sshd.CommandModule; +import com.google.gerrit.sshd.CommandName; +import com.google.gerrit.sshd.Commands; /** Register the commands a Gerrit server in master mode supports. */ diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/Receive.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java similarity index 96% rename from src/main/java/com/google/gerrit/server/ssh/commands/Receive.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java index a0ebb169fe..614148a89c 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/Receive.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java @@ -12,41 +12,41 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD_REPLACE; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_HEAD_UPDATE; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_TAG; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_TAG_ANNOTATED; -import static com.google.gerrit.client.reviewdb.ApprovalCategory.PUSH_TAG_ANY; +import static com.google.gerrit.reviewdb.ApprovalCategory.PUSH_HEAD; +import static com.google.gerrit.reviewdb.ApprovalCategory.PUSH_HEAD_REPLACE; +import static com.google.gerrit.reviewdb.ApprovalCategory.PUSH_HEAD_UPDATE; +import static com.google.gerrit.reviewdb.ApprovalCategory.PUSH_TAG; +import static com.google.gerrit.reviewdb.ApprovalCategory.PUSH_TAG_ANNOTATED; +import static com.google.gerrit.reviewdb.ApprovalCategory.PUSH_TAG_ANY; -import com.google.gerrit.client.Link; -import com.google.gerrit.client.data.ApprovalType; -import com.google.gerrit.client.data.ApprovalTypes; -import com.google.gerrit.client.reviewdb.AbstractAgreement; -import com.google.gerrit.client.reviewdb.Account; -import com.google.gerrit.client.reviewdb.AccountAgreement; -import com.google.gerrit.client.reviewdb.AccountGroup; -import com.google.gerrit.client.reviewdb.AccountGroupAgreement; -import com.google.gerrit.client.reviewdb.ApprovalCategory; -import com.google.gerrit.client.reviewdb.Branch; -import com.google.gerrit.client.reviewdb.Change; -import com.google.gerrit.client.reviewdb.ChangeMessage; -import com.google.gerrit.client.reviewdb.ContributorAgreement; -import com.google.gerrit.client.reviewdb.PatchSet; -import com.google.gerrit.client.reviewdb.PatchSetApproval; -import com.google.gerrit.client.reviewdb.PatchSetInfo; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.client.rpc.NoSuchAccountException; -import com.google.gerrit.git.PatchSetImporter; -import com.google.gerrit.git.ReplicationQueue; +import com.google.gerrit.common.PageLinks; +import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.errors.NoSuchAccountException; +import com.google.gerrit.reviewdb.AbstractAgreement; +import com.google.gerrit.reviewdb.Account; +import com.google.gerrit.reviewdb.AccountAgreement; +import com.google.gerrit.reviewdb.AccountGroup; +import com.google.gerrit.reviewdb.AccountGroupAgreement; +import com.google.gerrit.reviewdb.ApprovalCategory; +import com.google.gerrit.reviewdb.Branch; +import com.google.gerrit.reviewdb.Change; +import com.google.gerrit.reviewdb.ChangeMessage; +import com.google.gerrit.reviewdb.ContributorAgreement; +import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSetApproval; +import com.google.gerrit.reviewdb.PatchSetInfo; +import com.google.gerrit.reviewdb.ReviewDb; import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountResolver; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.Nullable; +import com.google.gerrit.server.git.PatchSetImporter; +import com.google.gerrit.server.git.ReplicationQueue; import com.google.gerrit.server.mail.CreateChangeSender; import com.google.gerrit.server.mail.EmailException; import com.google.gerrit.server.mail.MergedSender; @@ -322,7 +322,7 @@ final class Receive extends AbstractGitCommand { msg.append(":\n\n "); msg.append(canonicalWebUrl); msg.append("#"); - msg.append(Link.SETTINGS_AGREEMENTS); + msg.append(PageLinks.SETTINGS_AGREEMENTS); msg.append("\n"); } msg.append("\n"); @@ -346,7 +346,7 @@ final class Receive extends AbstractGitCommand { msg.append(":\n\n "); msg.append(canonicalWebUrl); msg.append("#"); - msg.append(Link.SETTINGS_CONTACT); + msg.append(PageLinks.SETTINGS_CONTACT); msg.append("\n"); } msg.append("\n"); @@ -376,7 +376,7 @@ final class Receive extends AbstractGitCommand { msg.append(":\n\n "); msg.append(canonicalWebUrl); msg.append("#"); - msg.append(Link.SETTINGS_AGREEMENTS); + msg.append(PageLinks.SETTINGS_AGREEMENTS); msg.append("\n"); } else { msg.append("."); diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/ScpCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java similarity index 97% rename from src/main/java/com/google/gerrit/server/ssh/commands/ScpCommand.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java index c31ea4219d..2fa177f226 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/ScpCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java @@ -20,10 +20,10 @@ * * @author Apache MINA SSHD Project */ -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.pgm.Version; -import com.google.gerrit.server.ssh.BaseCommand; +import com.google.gerrit.common.Version; +import com.google.gerrit.sshd.BaseCommand; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -222,7 +222,7 @@ final class ScpCommand extends BaseCommand { private static byte[] read(String path) { final InputStream in = ScpCommand.class.getClassLoader().getResourceAsStream( - "com/google/gerrit/server/ssh/scproot/" + path); + "com/google/gerrit/sshd/scproot/" + path); if (in == null) { return null; } diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/SlaveCommandModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SlaveCommandModule.java similarity index 84% rename from src/main/java/com/google/gerrit/server/ssh/commands/SlaveCommandModule.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SlaveCommandModule.java index 449de813f9..c0074a99cb 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/SlaveCommandModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SlaveCommandModule.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; -import com.google.gerrit.server.ssh.CommandModule; -import com.google.gerrit.server.ssh.CommandName; -import com.google.gerrit.server.ssh.Commands; +import com.google.gerrit.sshd.CommandModule; +import com.google.gerrit.sshd.CommandName; +import com.google.gerrit.sshd.Commands; /** Register the commands a Gerrit server in slave mode supports. */ diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/Upload.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java similarity index 95% rename from src/main/java/com/google/gerrit/server/ssh/commands/Upload.java rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java index 6e03829901..389b838e02 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/Upload.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.commands; +package com.google.gerrit.sshd.commands; import org.eclipse.jgit.transport.UploadPack; diff --git a/src/main/java/com/google/gerrit/server/ssh/scproot/TOC b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/TOC similarity index 100% rename from src/main/java/com/google/gerrit/server/ssh/scproot/TOC rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/TOC diff --git a/src/main/java/com/google/gerrit/server/ssh/scproot/bin/gerrit-cherry-pick b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/bin/gerrit-cherry-pick similarity index 100% rename from src/main/java/com/google/gerrit/server/ssh/scproot/bin/gerrit-cherry-pick rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/bin/gerrit-cherry-pick diff --git a/src/main/java/com/google/gerrit/server/ssh/scproot/hooks/commit-msg b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/hooks/commit-msg similarity index 100% rename from src/main/java/com/google/gerrit/server/ssh/scproot/hooks/commit-msg rename to gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/hooks/commit-msg diff --git a/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/CommitMsgHookTest.java b/gerrit-sshd/src/test/java/com/google/gerrit/sshd/scproot/hooks/CommitMsgHookTest.java similarity index 99% rename from src/test/java/com/google/gerrit/server/ssh/scproot/hooks/CommitMsgHookTest.java rename to gerrit-sshd/src/test/java/com/google/gerrit/sshd/scproot/hooks/CommitMsgHookTest.java index 8c7d056ef8..1ed79b92e7 100644 --- a/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/CommitMsgHookTest.java +++ b/gerrit-sshd/src/test/java/com/google/gerrit/sshd/scproot/hooks/CommitMsgHookTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ssh.scproot.hooks; +package com.google.gerrit.sshd.scproot.hooks; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheBuilder; diff --git a/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/HookTestCase.java b/gerrit-sshd/src/test/java/com/google/gerrit/sshd/scproot/hooks/HookTestCase.java similarity index 96% rename from src/test/java/com/google/gerrit/server/ssh/scproot/hooks/HookTestCase.java rename to gerrit-sshd/src/test/java/com/google/gerrit/sshd/scproot/hooks/HookTestCase.java index a5e45f2235..5902642220 100644 --- a/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/HookTestCase.java +++ b/gerrit-sshd/src/test/java/com/google/gerrit/sshd/scproot/hooks/HookTestCase.java @@ -48,7 +48,7 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF // ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -package com.google.gerrit.server.ssh.scproot.hooks; +package com.google.gerrit.sshd.scproot.hooks; import com.google.gerrit.testutil.LocalDiskRepositoryTestCase; @@ -68,7 +68,7 @@ public abstract class HookTestCase extends LocalDiskRepositoryTestCase { } protected File getHook(final String name) { - final String scproot = "com/google/gerrit/server/ssh/scproot"; + final String scproot = "com/google/gerrit/sshd/scproot"; final String path = scproot + "/hooks/" + name; final URL url = cl().getResource(path); if (url == null) { diff --git a/src/test/java/com/google/gerrit/testutil/LocalDiskRepositoryTestCase.java b/gerrit-sshd/src/test/java/com/google/gerrit/testutil/LocalDiskRepositoryTestCase.java similarity index 100% rename from src/test/java/com/google/gerrit/testutil/LocalDiskRepositoryTestCase.java rename to gerrit-sshd/src/test/java/com/google/gerrit/testutil/LocalDiskRepositoryTestCase.java diff --git a/src/test/java/com/google/gerrit/testutil/MockSystemReader.java b/gerrit-sshd/src/test/java/com/google/gerrit/testutil/MockSystemReader.java similarity index 100% rename from src/test/java/com/google/gerrit/testutil/MockSystemReader.java rename to gerrit-sshd/src/test/java/com/google/gerrit/testutil/MockSystemReader.java diff --git a/gerrit-util-cli/.gitignore b/gerrit-util-cli/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-util-cli/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-util-cli/.settings/org.eclipse.core.resources.prefs b/gerrit-util-cli/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-util-cli/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-util-cli/.settings/org.eclipse.core.runtime.prefs b/gerrit-util-cli/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-util-cli/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-util-cli/.settings/org.eclipse.jdt.core.prefs b/gerrit-util-cli/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-util-cli/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-util-cli/.settings/org.eclipse.jdt.ui.prefs b/gerrit-util-cli/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-util-cli/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-util-cli/pom.xml b/gerrit-util-cli/pom.xml new file mode 100644 index 0000000000..6c3f25cbe9 --- /dev/null +++ b/gerrit-util-cli/pom.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-util-cli + Gerrit Code Review - Utility - CLI + + + Utilities to support command line parsing + + + + + args4j + args4j + + + + com.google.code.guice + guice + + + + com.google.code.guice + guice-assistedinject + + + diff --git a/src/main/java/com/google/gerrit/pgm/CmdLineParser.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java similarity index 99% rename from src/main/java/com/google/gerrit/pgm/CmdLineParser.java rename to gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java index 70d14a24ae..f83d852c26 100644 --- a/src/main/java/com/google/gerrit/pgm/CmdLineParser.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.google.gerrit.pgm; +package com.google.gerrit.util.cli; import com.google.inject.Inject; import com.google.inject.Injector; diff --git a/src/main/java/com/google/gerrit/pgm/OptionHandlerFactory.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerFactory.java similarity index 96% rename from src/main/java/com/google/gerrit/pgm/OptionHandlerFactory.java rename to gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerFactory.java index 37e12ce013..ee5b9b6cab 100644 --- a/src/main/java/com/google/gerrit/pgm/OptionHandlerFactory.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerFactory.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.pgm; +package com.google.gerrit.util.cli; import org.kohsuke.args4j.OptionDef; import org.kohsuke.args4j.spi.OptionHandler; diff --git a/src/main/java/com/google/gerrit/pgm/OptionHandlerUtil.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java similarity index 97% rename from src/main/java/com/google/gerrit/pgm/OptionHandlerUtil.java rename to gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java index 898455218a..ab6739709b 100644 --- a/src/main/java/com/google/gerrit/pgm/OptionHandlerUtil.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.pgm; +package com.google.gerrit.util.cli; import com.google.inject.Key; import com.google.inject.TypeLiteral; diff --git a/gerrit-util-ssl/.gitignore b/gerrit-util-ssl/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-util-ssl/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-util-ssl/.settings/org.eclipse.core.resources.prefs b/gerrit-util-ssl/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-util-ssl/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-util-ssl/.settings/org.eclipse.core.runtime.prefs b/gerrit-util-ssl/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-util-ssl/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-util-ssl/.settings/org.eclipse.jdt.core.prefs b/gerrit-util-ssl/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-util-ssl/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-util-ssl/.settings/org.eclipse.jdt.ui.prefs b/gerrit-util-ssl/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-util-ssl/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-util-ssl/pom.xml b/gerrit-util-ssl/pom.xml new file mode 100644 index 0000000000..90cbb07c61 --- /dev/null +++ b/gerrit-util-ssl/pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-util-ssl + Gerrit Code Review - Utility - SSL + + + Utilities to support SSL based protocols + + diff --git a/src/main/java/com/google/gerrit/server/ioutil/BlindSSLSocketFactory.java b/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java similarity index 98% rename from src/main/java/com/google/gerrit/server/ioutil/BlindSSLSocketFactory.java rename to gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java index 853035b2d6..ed31379afb 100644 --- a/src/main/java/com/google/gerrit/server/ioutil/BlindSSLSocketFactory.java +++ b/gerrit-util-ssl/src/main/java/com/google/gerrit/util/ssl/BlindSSLSocketFactory.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.ioutil; +package com.google.gerrit.util.ssl; import java.io.IOException; import java.net.InetAddress; diff --git a/gerrit-war/.gitignore b/gerrit-war/.gitignore new file mode 100644 index 0000000000..903c6c80f5 --- /dev/null +++ b/gerrit-war/.gitignore @@ -0,0 +1,4 @@ +/target +/.classpath +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/gerrit-war/.settings/org.eclipse.core.resources.prefs b/gerrit-war/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..82eb859e3b --- /dev/null +++ b/gerrit-war/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/gerrit-war/.settings/org.eclipse.core.runtime.prefs b/gerrit-war/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..8667cfd4a3 --- /dev/null +++ b/gerrit-war/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/gerrit-war/.settings/org.eclipse.jdt.core.prefs b/gerrit-war/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..04afc7fac5 --- /dev/null +++ b/gerrit-war/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,268 @@ +#Tue May 12 17:44:13 PDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/gerrit-war/.settings/org.eclipse.jdt.ui.prefs b/gerrit-war/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..d4218a5fc0 --- /dev/null +++ b/gerrit-war/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,61 @@ +#Wed Jul 29 11:31:38 PDT 2009 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Google Format +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=false +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=true +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=false +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml new file mode 100644 index 0000000000..113214bf60 --- /dev/null +++ b/gerrit-war/pom.xml @@ -0,0 +1,150 @@ + + + + 4.0.0 + + + com.google.gerrit + gerrit-parent + 2.0.25-SNAPSHOT + + + gerrit-war + Gerrit Code Review - WAR + war + + + Gerrit packaged as a standard web application archive + + + + + javax.servlet + servlet-api + provided + + + + com.google.gerrit + gerrit-gwtui + war + runtime + + + + com.google.gerrit + gerrit-main + provided + + + + bouncycastle + bcprov-jdk15 + 140 + provided + + + + bouncycastle + bcpg-jdk15 + 140 + provided + + + + org.slf4j + slf4j-log4j12 + + + + log4j + log4j + + + + com.google.gerrit + gerrit-sshd + + + + com.google.gerrit + gerrit-httpd + + + + com.google.gerrit + gerrit-pgm + + + + + + + org.apache.maven.plugins + maven-war-plugin + + gerrit-${project.version} + true + + false + + Main + Gerrit Code Review + ${project.version} + + + + + com.google.gerrit + gerrit-main + jar + + Main.class + com/google/gerrit/main/*.class + + + + + + + + maven-antrun-plugin + + + fix-output + process-classes + + + + + + + + + + run + + + + + + + diff --git a/src/main/java/com/google/gerrit/server/http/GerritServletConfig.java b/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java similarity index 93% rename from src/main/java/com/google/gerrit/server/http/GerritServletConfig.java rename to gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java index df21460523..aa4763d3da 100644 --- a/src/main/java/com/google/gerrit/server/http/GerritServletConfig.java +++ b/gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.http; +package com.google.gerrit.httpd; import static com.google.inject.Stage.PRODUCTION; -import com.google.gerrit.git.PushAllProjectsOp; -import com.google.gerrit.git.ReloadSubmitQueueOp; -import com.google.gerrit.git.WorkQueue; import com.google.gerrit.server.cache.CachePool; import com.google.gerrit.server.config.CanonicalWebUrlModule; import com.google.gerrit.server.config.DatabaseModule; import com.google.gerrit.server.config.GerritGlobalModule; -import com.google.gerrit.server.ssh.SshDaemon; -import com.google.gerrit.server.ssh.SshModule; -import com.google.gerrit.server.ssh.commands.MasterCommandModule; +import com.google.gerrit.server.git.PushAllProjectsOp; +import com.google.gerrit.server.git.ReloadSubmitQueueOp; +import com.google.gerrit.server.git.WorkQueue; +import com.google.gerrit.sshd.SshDaemon; +import com.google.gerrit.sshd.SshModule; +import com.google.gerrit.sshd.commands.MasterCommandModule; import com.google.inject.ConfigurationException; import com.google.inject.CreationException; import com.google.inject.Guice; @@ -50,9 +50,9 @@ import javax.servlet.http.HttpServletRequest; import javax.sql.DataSource; /** Configures the web application environment for Gerrit Code Review. */ -public class GerritServletConfig extends GuiceServletContextListener { +public class WebAppInitializer extends GuiceServletContextListener { private static final Logger log = - LoggerFactory.getLogger(GerritServletConfig.class); + LoggerFactory.getLogger(WebAppInitializer.class); private Injector dbInjector; private Injector sysInjector; diff --git a/src/main/java/log4j.properties b/gerrit-war/src/main/java/log4j.properties similarity index 100% rename from src/main/java/log4j.properties rename to gerrit-war/src/main/java/log4j.properties diff --git a/src/main/java/GerritServer.properties_example b/gerrit-war/src/main/webapp/WEB-INF/extra/GerritServer.properties_example similarity index 100% rename from src/main/java/GerritServer.properties_example rename to gerrit-war/src/main/webapp/WEB-INF/extra/GerritServer.properties_example diff --git a/src/main/webapp/WEB-INF/extra/jetty6/gerrit-jetty.sh b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/gerrit-jetty.sh similarity index 100% rename from src/main/webapp/WEB-INF/extra/jetty6/gerrit-jetty.sh rename to gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/gerrit-jetty.sh diff --git a/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml similarity index 100% rename from src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml rename to gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/gerrit.xml diff --git a/src/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml similarity index 100% rename from src/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml rename to gerrit-war/src/main/webapp/WEB-INF/extra/jetty6/jetty_sslproxy.xml diff --git a/src/main/webapp/WEB-INF/extra/jetty7/gerrit-jetty.sh b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/gerrit-jetty.sh similarity index 100% rename from src/main/webapp/WEB-INF/extra/jetty7/gerrit-jetty.sh rename to gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/gerrit-jetty.sh diff --git a/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml similarity index 100% rename from src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml rename to gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/gerrit.xml diff --git a/src/main/webapp/WEB-INF/extra/jetty7/jetty_sslproxy.xml b/gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/jetty_sslproxy.xml similarity index 100% rename from src/main/webapp/WEB-INF/extra/jetty7/jetty_sslproxy.xml rename to gerrit-war/src/main/webapp/WEB-INF/extra/jetty7/jetty_sslproxy.xml diff --git a/src/main/webapp/WEB-INF/sql/index_generic.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/index_generic.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/index_generic.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/index_generic.sql diff --git a/src/main/webapp/WEB-INF/sql/index_postgres.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/index_postgres.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/index_postgres.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/index_postgres.sql diff --git a/src/main/webapp/WEB-INF/sql/mysql_nextval.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/mysql_nextval.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/mysql_nextval.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/mysql_nextval.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade003_004.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade003_004.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade003_004.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade003_004.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade004_005_part1.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade004_005_part1.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade004_005_part1.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade004_005_part1.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade004_005_part2.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade004_005_part2.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade004_005_part2.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade004_005_part2.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade005_006.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade005_006.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade005_006.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade005_006.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade006_007.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade006_007.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade006_007.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade006_007.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade007_008.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade007_008.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade007_008.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade007_008.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade008_009.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade008_009.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade008_009.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade008_009.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade009_010.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade009_010.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade009_010.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade009_010.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade010_011.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade010_011.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade010_011.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade010_011.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade011_012_part1.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade011_012_part1.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade011_012_part1.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade011_012_part1.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade011_012_part2.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade011_012_part2.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade011_012_part2.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade011_012_part2.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade012_013_mysql.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade012_013_mysql.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade012_013_mysql.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade012_013_mysql.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade012_013_postgres.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade012_013_postgres.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade012_013_postgres.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade012_013_postgres.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade013_014_mysql.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade013_014_mysql.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade013_014_mysql.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade013_014_mysql.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade013_014_postgres.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade013_014_postgres.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade013_014_postgres.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade013_014_postgres.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade014_015_part1_mysql.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade014_015_part1_mysql.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade014_015_part1_mysql.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade014_015_part1_mysql.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade014_015_part1_postgres.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade014_015_part1_postgres.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade014_015_part1_postgres.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade014_015_part1_postgres.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade014_015_part2.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade014_015_part2.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade014_015_part2.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade014_015_part2.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade015_016_part1_mysql.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade015_016_part1_mysql.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade015_016_part1_mysql.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade015_016_part1_mysql.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade015_016_part1_postgres.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade015_016_part1_postgres.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade015_016_part1_postgres.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade015_016_part1_postgres.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade015_016_part2.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade015_016_part2.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade015_016_part2.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade015_016_part2.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade016_017_mysql.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade016_017_mysql.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade016_017_mysql.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade016_017_mysql.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade016_017_postgres.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade016_017_postgres.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade016_017_postgres.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade016_017_postgres.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade017_018_mysql.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade017_018_mysql.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade017_018_mysql.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade017_018_mysql.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade017_018_postgres.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade017_018_postgres.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade017_018_postgres.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade017_018_postgres.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade018_019_mysql.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade018_019_mysql.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade018_019_mysql.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade018_019_mysql.sql diff --git a/src/main/webapp/WEB-INF/sql/upgrade018_019_postgres.sql b/gerrit-war/src/main/webapp/WEB-INF/sql/upgrade018_019_postgres.sql similarity index 100% rename from src/main/webapp/WEB-INF/sql/upgrade018_019_postgres.sql rename to gerrit-war/src/main/webapp/WEB-INF/sql/upgrade018_019_postgres.sql diff --git a/src/main/webapp/WEB-INF/web.xml b/gerrit-war/src/main/webapp/WEB-INF/web.xml similarity index 85% rename from src/main/webapp/WEB-INF/web.xml rename to gerrit-war/src/main/webapp/WEB-INF/web.xml index 4ef561c1ca..205341c35a 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/gerrit-war/src/main/webapp/WEB-INF/web.xml @@ -16,6 +16,6 @@ - com.google.gerrit.server.http.GerritServletConfig + com.google.gerrit.httpd.WebAppInitializer diff --git a/src/main/webapp/favicon.ico b/gerrit-war/src/main/webapp/favicon.ico similarity index 100% rename from src/main/webapp/favicon.ico rename to gerrit-war/src/main/webapp/favicon.ico diff --git a/src/main/webapp/robots.txt b/gerrit-war/src/main/webapp/robots.txt similarity index 100% rename from src/main/webapp/robots.txt rename to gerrit-war/src/main/webapp/robots.txt diff --git a/gerrit_debug.launch b/gerrit_debug.launch deleted file mode 100644 index 077458a66d..0000000000 --- a/gerrit_debug.launch +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gerrit_macos.launch b/gerrit_macos.launch deleted file mode 100644 index 83fbd1813f..0000000000 --- a/gerrit_macos.launch +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 8a37120216..57f1f90b58 100644 --- a/pom.xml +++ b/pom.xml @@ -18,30 +18,71 @@ limitations under the License. xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - gerrit - gerrit - war + + com.google.gerrit + gerrit-parent + pom 2.0.25-SNAPSHOT - gerrit - Gerrit - Web Based Code Review - http://android.git.kernel.org/?p=tools/gerrit.git + + Gerrit Code Review - Parent + http://code.google.com/p/gerrit/ + + + Gerrit - Web Based Code Review + repo-discuss mailing list repo-discuss@googlegroups.com + http://groups.google.com/group/repo-discuss + http://groups.google.com/group/repo-discuss/subscribe - - - Shawn O. Pearce - sop@google.com - - Maintainer - - - + + http://code.google.com/p/gerrit/issues/list + Google Code + + + + 0.6.0-23-g36af95b7 + 1.1.2 + 1.1.1 + 1.1.4-SNAPSHOT + 1.7.0 + 1.5.8 + 2.0 + + OBF + + + UTF-8 + + + UTF-8 + + + + + gerrit-patch-commonsnet + gerrit-patch-gwtexpui + gerrit-patch-jgit + + gerrit-util-cli + gerrit-util-ssl + + gerrit-common + gerrit-httpd + gerrit-main + gerrit-pgm + gerrit-reviewdb + gerrit-server + gerrit-sshd + gerrit-war + + gerrit-gwtui + @@ -252,203 +293,34 @@ limitations under the License. - - 0.6.0-23-g36af95b7 - 1.1.2 - 1.1.1 - 1.1.4-SNAPSHOT - 1.7.0 - OBF - - UTF-8 - - - UTF-8 - - - - src/main/java - - log4j.properties - com/google/gerrit/client/GerritVersion.properties - com/google/gerrit/server/ssh/scproot/** - + ${basedir}/src/main/java + + **/*.gwt.xml + **/*.java + - maven-clean-plugin - 2.2 - - - - src/main/webapp - - gerrit - WEB-INF/lib - - false - - - - - - - org.antlr - antlr3-maven-plugin - 3.1.1 - - - - antlr - - - - - - - org.apache.maven.plugins maven-compiler-plugin + 2.0.2 1.6 1.6 + UTF-8 - org.codehaus.mojo - gwt-maven-plugin - 1.1 - - com.google.gerrit.Gerrit - ${project.build.directory}/${project.name}-${project.version} - -Xmx512m - - + maven-source-plugin - compile - - - - - - - org.apache.maven.plugins - maven-war-plugin - - WEB-INF/web-jetty.xml - true - - - ExecutableWarMain - - - com.google.gerrit.pgm - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - make-executable - generate-resources - - unpack - - - - - gerrit - executablewar - true - ${project.build.directory}/executablewar - **/*.class - - - gerrit - gerrit-keyapplet - true - ${project.build.directory}/gerrit-keyapplet - **/* - - - - - - - - - maven-antrun-plugin - - - generate-version - generate-resources - - - - - - - - version=${v} - - - - run - - - - - fix-output - process-classes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run + jar @@ -457,233 +329,440 @@ limitations under the License. - - gwtorm - gwtorm - ${gwtormVersion} - compile - - - gwtorm - gwtorm - ${gwtormVersion} - sources - provided - jar - - - - gwtjsonrpc - gwtjsonrpc - ${gwtjsonrpcVersion} - compile - - - gwtjsonrpc - gwtjsonrpc - ${gwtjsonrpcVersion} - sources - provided - jar - - - - gwtexpui - gwtexpui - ${gwtexpuiVersion} - compile - - - gwtexpui - gwtexpui - ${gwtexpuiVersion} - sources - provided - jar - - - - gerrit - executablewar - 1.2 - provided - - - - gerrit - gerrit-keyapplet - 1.0 - test - - - - org.openid4java - openid4java-consumer - 0.9.5 - compile - - - - jug - jug - - - - xml-apis - xml-apis - - - - - - org.apache.sshd - sshd-core - 0.2.0 - compile - - - - net.sf.ehcache - ehcache-core - 1.7.0 - - - - args4j - args4j - 2.0.16 - - - - com.google.code.guice - guice - 2.0 - - - com.google.code.guice - guice-servlet - 2.0 - - - com.google.code.guice - guice-assistedinject - 2.0 - - - - aopalliance - aopalliance - 1.0 - - - - commons-net - commons-net - 2.0 - - - - eu.medsea.mimeutil - mime-util - 2.1.2 - - - - org.antlr - antlr - 3.1.1 - compile - - - - bouncycastle - bcpg-jdk15 - 140 - provided - - - - org.slf4j - slf4j-log4j12 - 1.5.8 - runtime - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - - - - org.eclipse - jgit - ${jgitVersion} - compile - - - org.eclipse - jgit - ${jgitVersion} - sources - provided - jar - - junit junit - 3.8.2 - test - - - - com.h2database - h2 - 1.2.122 test org.easymock easymock - 2.5.1 - test - - - org.easymock - easymockclassextension - 2.4 test - - com.google.gwt - gwt-servlet - ${gwtVersion} - runtime - - - com.google.gwt - gwt-user - ${gwtVersion} - provided + org.easymock + easymockclassextension + test + + + + com.google.gerrit + gerrit-patch-commonsnet + ${project.version} + + + + com.google.gerrit + gerrit-patch-gwtexpui + ${project.version} + + + com.google.gerrit + gerrit-patch-gwtexpui + ${project.version} + sources + + + + com.google.gerrit + gerrit-patch-jgit + ${project.version} + + + com.google.gerrit + gerrit-patch-jgit + ${project.version} + sources + + + + com.google.gerrit + gerrit-common + ${project.version} + + + com.google.gerrit + gerrit-common + ${project.version} + sources + + + + com.google.gerrit + gerrit-gwtui + ${project.version} + + + com.google.gerrit + gerrit-gwtui + ${project.version} + war + + + + com.google.gerrit + gerrit-httpd + ${project.version} + + + + com.google.gerrit + gerrit-main + ${project.version} + + + + com.google.gerrit + gerrit-pgm + ${project.version} + + + + com.google.gerrit + gerrit-reviewdb + ${project.version} + + + com.google.gerrit + gerrit-reviewdb + ${project.version} + sources + + + + com.google.gerrit + gerrit-server + ${project.version} + + + + com.google.gerrit + gerrit-sshd + ${project.version} + + + + com.google.gerrit + gerrit-war + ${project.version} + + + com.google.gerrit + gerrit-war + ${project.version} + war + + + + com.google.gerrit + gerrit-util-cli + ${project.version} + + + + com.google.gerrit + gerrit-util-ssl + ${project.version} + + + + gwtorm + gwtorm + ${gwtormVersion} + + + gwtorm + gwtorm + ${gwtormVersion} + sources + + + + gwtjsonrpc + gwtjsonrpc + ${gwtjsonrpcVersion} + + + gwtjsonrpc + gwtjsonrpc + ${gwtjsonrpcVersion} + sources + + + + gwtexpui + gwtexpui + ${gwtexpuiVersion} + + + gwtexpui + gwtexpui + ${gwtexpuiVersion} + sources + + + + gerrit + gerrit-keyapplet + 1.0 + + + + org.openid4java + openid4java-consumer + 0.9.5 + + + + jug + jug + + + + xml-apis + xml-apis + + + + + + org.apache.sshd + sshd-core + 0.2.0 + + + + net.sf.ehcache + ehcache-core + 1.7.0 + + + + args4j + args4j + 2.0.16 + + + + com.google.code.guice + guice + ${guiceVersion} + + + + com.google.code.guice + guice-servlet + ${guiceVersion} + + + + com.google.code.guice + guice-assistedinject + ${guiceVersion} + + + + + aopalliance + aopalliance + 1.0 + + + + commons-net + commons-net + 2.0 + + + + commons-codec + commons-codec + 1.3 + + + + eu.medsea.mimeutil + mime-util + 2.1.2 + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + org.antlr + antlr + 3.1.1 + + + org.antlr + stringtemplate + + + antlr + antlr + + + + + + bouncycastle + bcpg-jdk15 + 140 + + + + org.slf4j + slf4j-api + ${slf4jVersion} + + + + org.slf4j + slf4j-log4j12 + ${slf4jVersion} + + + + log4j + log4j + 1.2.15 + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + + + + org.eclipse + jgit + ${jgitVersion} + + + org.eclipse + jgit + ${jgitVersion} + sources + + + + junit + junit + 3.8.2 + + + + com.h2database + h2 + 1.2.122 + + + + org.easymock + easymock + 2.5.1 + + + + org.easymock + easymockclassextension + 2.4 + + + + javax.servlet + servlet-api + 2.5 + + + + com.google.gwt + gwt-servlet + ${gwtVersion} + + + + com.google.gwt + gwt-user + ${gwtVersion} + + + + com.google.gwt + gwt-dev + ${gwtVersion} + ${platform} + + + + + + + gwt-dev-windows + + windows + + + true + + windows + + + + + + gwt-dev-mac + + mac + + + false + + mac + + + + + + gwt-dev-linux + + linux + + + false + + linux + + + + + jgit-repository diff --git a/src/main/java/com/google/gerrit/server/rpc/SystemInfoServiceImpl.java b/src/main/java/com/google/gerrit/server/rpc/SystemInfoServiceImpl.java deleted file mode 100644 index 799e252b64..0000000000 --- a/src/main/java/com/google/gerrit/server/rpc/SystemInfoServiceImpl.java +++ /dev/null @@ -1,159 +0,0 @@ -// Copyright (C) 2008 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.gerrit.server.rpc; - -import com.google.gerrit.client.data.SshHostKey; -import com.google.gerrit.client.data.SystemInfoService; -import com.google.gerrit.client.reviewdb.ContributorAgreement; -import com.google.gerrit.client.reviewdb.ReviewDb; -import com.google.gerrit.server.ssh.SshInfo; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwtorm.client.OrmException; -import com.google.gwtorm.client.SchemaFactory; -import com.google.inject.Inject; -import com.google.inject.Provider; - -import com.jcraft.jsch.HostKey; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; - -import org.apache.sshd.common.util.Buffer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.UnknownHostException; -import java.security.PublicKey; -import java.security.interfaces.DSAPublicKey; -import java.security.interfaces.RSAPublicKey; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - -class SystemInfoServiceImpl implements SystemInfoService { - private static final Logger log = - LoggerFactory.getLogger(SystemInfoServiceImpl.class); - private static final JSch JSCH = new JSch(); - - private final SchemaFactory schema; - private final SshInfo sshd; - private final List hostKeys; - private final Provider httpRequest; - - @Inject - SystemInfoServiceImpl(final SchemaFactory sf, final SshInfo daemon, - final Provider hsr) { - schema = sf; - sshd = daemon; - hostKeys = sortHostKeys(); - httpRequest = hsr; - } - - private static boolean isIPv6(final InetAddress ip) { - return ip instanceof Inet6Address - && ip.getHostName().equals(ip.getHostAddress()); - } - - public void contributorAgreements( - final AsyncCallback> callback) { - try { - final ReviewDb db = schema.open(); - try { - callback.onSuccess(db.contributorAgreements().active().toList()); - } finally { - db.close(); - } - } catch (OrmException e) { - callback.onFailure(e); - } - } - - public void daemonHostKeys(final AsyncCallback> callback) { - final String hostIdent = hostIdent(); - if (hostIdent == null) { - callback.onSuccess(Collections. emptyList()); - return; - } - - final ArrayList r = new ArrayList(hostKeys.size()); - for (final PublicKey pub : hostKeys) { - try { - final HostKey hk = toHostKey(hostIdent, pub); - r.add(new SshHostKey(hk.getHost(), hk.getType() + " " + hk.getKey(), hk - .getFingerPrint(JSCH))); - } catch (JSchException e) { - log.error("Invalid host key", e); - continue; - } - } - callback.onSuccess(r); - } - - private List sortHostKeys() { - final List r = new ArrayList(2); - r.addAll(sshd.getHostKeys()); - Collections.sort(r, new Comparator() { - @Override - public int compare(final PublicKey a, final PublicKey b) { - if (a == b) { - return 0; - } - if (a instanceof RSAPublicKey) { - return -1; - } - if (a instanceof DSAPublicKey) { - return 1; - } - return 0; - } - }); - return Collections.unmodifiableList(r); - } - - private HostKey toHostKey(final String hostIdent, final PublicKey pub) - throws JSchException { - final Buffer buf = new Buffer(); - buf.putPublicKey(pub); - final byte[] keyBin = buf.getCompactData(); - return new HostKey(hostIdent, keyBin); - } - - private String hostIdent() { - InetSocketAddress addr = sshd.getAddress(); - if (addr == null) { - return null; - } - - InetAddress ip = addr.getAddress(); - if (ip.isAnyLocalAddress()) { - try { - ip = InetAddress.getByName(httpRequest.get().getServerName()); - } catch (UnknownHostException e) { - throw new RuntimeException(e); - } - addr = new InetSocketAddress(ip, addr.getPort()); - } - - if (addr.getPort() == 22 && !isIPv6(ip)) { - return addr.getHostName(); - } - return "[" + addr.getHostName() + "]:" + addr.getPort(); - } -} diff --git a/src/main/webapp/WEB-INF/web-jetty.xml b/src/main/webapp/WEB-INF/web-jetty.xml deleted file mode 100644 index 084d6c68a3..0000000000 --- a/src/main/webapp/WEB-INF/web-jetty.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - target/classes - diff --git a/to_hosted.sh b/to_hosted.sh deleted file mode 100755 index 247d3d1154..0000000000 --- a/to_hosted.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -mvn war:inplace && -rm -f src/main/webapp/WEB-INF/lib/gerrit-*.jar diff --git a/GoogleFormat.xml b/tools/GoogleFormat.xml similarity index 100% rename from GoogleFormat.xml rename to tools/GoogleFormat.xml diff --git a/tools/gwtui_any.launch b/tools/gwtui_any.launch new file mode 100644 index 0000000000..e565a73a1a --- /dev/null +++ b/tools/gwtui_any.launch @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/gwtui_mac.launch b/tools/gwtui_mac.launch new file mode 100644 index 0000000000..5ce75981fb --- /dev/null +++ b/tools/gwtui_mac.launch @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/pgm_daemon.launch b/tools/pgm_daemon.launch new file mode 100644 index 0000000000..30b7f6a639 --- /dev/null +++ b/tools/pgm_daemon.launch @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/to_jetty.sh b/tools/to_jetty.sh similarity index 83% rename from to_jetty.sh rename to tools/to_jetty.sh index e0f80f4839..28188349d1 100755 --- a/to_jetty.sh +++ b/tools/to_jetty.sh @@ -21,7 +21,8 @@ fi ctx="$jetty/contexts/gerrit.xml" && mvn clean package && -war=target/gerrit-*.war && +war=gerrit-war/target/gerrit-*.war && +extra=gerrit-war/src/main/webapp/WEB-INF/extra/ && cp $war "$jetty/webapps/gerrit.war" && if [ -f "$ctx" ] @@ -29,7 +30,7 @@ then touch "$ctx" else rm -f "$jetty/contexts/test.xml" && - java -jar $war --cat extra/jetty6/gerrit.xml >"$ctx" && + cp "$extra/jetty6/gerrit.xml" "$ctx" && echo >&2 echo >&2 "You need to copy JDBC drivers to $jetty/lib/plus"