From 898832619ad1c0a2facc4eb4be2cc27b275e26c0 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 16 Aug 2017 22:21:14 +0200 Subject: [PATCH] Dissolve gerrit-extension-api top-level directory Change-Id: I47a130d3203cf45ce09f2a44e81449c55eaa693b --- BUILD | 6 ++--- gerrit-acceptance-framework/BUILD | 2 +- gerrit-acceptance-tests/BUILD | 2 +- .../google/gerrit/acceptance/api/group/BUILD | 2 +- .../gerrit/acceptance/rest/project/BUILD | 4 ++-- gerrit-cache-h2/BUILD | 2 +- gerrit-common/BUILD | 4 ++-- gerrit-elasticsearch/BUILD | 4 ++-- gerrit-gpg/BUILD | 2 +- gerrit-gwtui/BUILD | 2 +- gerrit-httpd/BUILD | 4 ++-- gerrit-index/BUILD | 2 +- gerrit-lucene/BUILD | 2 +- gerrit-oauth/BUILD | 2 +- gerrit-openid/BUILD | 2 +- gerrit-pgm/BUILD | 2 +- gerrit-plugin-api/BUILD | 6 ++--- gerrit-plugin-gwtui/BUILD | 2 +- gerrit-prettify/BUILD | 2 +- gerrit-reviewdb/BUILD | 4 ++-- gerrit-server/BUILD | 14 +++++------ gerrit-sshd/BUILD | 4 ++-- gerrit-util-http/BUILD | 2 +- gerrit-war/BUILD | 2 +- .../com/google/gerrit/extensions}/BUILD | 23 ++++--------------- .../gerrit/extensions/Extensions.gwt.xml | 0 .../annotations/CapabilityScope.java | 0 .../gerrit/extensions/annotations/Export.java | 0 .../extensions/annotations/ExportImpl.java | 0 .../extensions/annotations/Exports.java | 0 .../annotations/ExtensionPoint.java | 0 .../gerrit/extensions/annotations/Listen.java | 0 .../annotations/PluginCanonicalWebUrl.java | 0 .../extensions/annotations/PluginData.java | 0 .../extensions/annotations/PluginName.java | 0 .../annotations/RequiresAnyCapability.java | 0 .../annotations/RequiresCapability.java | 0 .../extensions/annotations/RootRelative.java | 0 .../gerrit/extensions/api/GerritApi.java | 0 .../api/access/AccessSectionInfo.java | 0 .../api/access/GlobalOrPluginPermission.java | 0 .../extensions/api/access/PermissionInfo.java | 0 .../api/access/PermissionRuleInfo.java | 0 .../api/access/PluginPermission.java | 0 .../api/access/ProjectAccessInfo.java | 0 .../api/access/ProjectAccessInput.java | 0 .../extensions/api/accounts/AccountApi.java | 0 .../extensions/api/accounts/AccountInput.java | 0 .../extensions/api/accounts/Accounts.java | 0 .../extensions/api/accounts/EmailInput.java | 0 .../extensions/api/accounts/GpgKeyApi.java | 0 .../extensions/api/accounts/GpgKeysInput.java | 0 .../extensions/api/accounts/SshKeyInput.java | 0 .../extensions/api/accounts/StatusInput.java | 0 .../api/accounts/UsernameInput.java | 0 .../extensions/api/changes/AbandonInput.java | 0 .../extensions/api/changes/ActionVisitor.java | 0 .../api/changes/AddReviewerInput.java | 0 .../api/changes/AddReviewerResult.java | 0 .../extensions/api/changes/AssigneeInput.java | 0 .../extensions/api/changes/ChangeApi.java | 0 .../extensions/api/changes/ChangeEditApi.java | 0 .../extensions/api/changes/Changes.java | 0 .../api/changes/CherryPickInput.java | 0 .../extensions/api/changes/CommentApi.java | 0 .../api/changes/DeleteCommentInput.java | 0 .../api/changes/DeleteReviewerInput.java | 0 .../api/changes/DeleteVoteInput.java | 0 .../extensions/api/changes/DraftApi.java | 0 .../extensions/api/changes/DraftInput.java | 0 .../extensions/api/changes/FileApi.java | 0 .../extensions/api/changes/FixInput.java | 0 .../extensions/api/changes/HashtagsInput.java | 0 .../api/changes/IncludedInInfo.java | 0 .../extensions/api/changes/MoveInput.java | 0 .../api/changes/NotifyHandling.java | 0 .../extensions/api/changes/NotifyInfo.java | 0 .../api/changes/PublishChangeEditInput.java | 0 .../extensions/api/changes/RebaseInput.java | 0 .../extensions/api/changes/RecipientType.java | 0 .../extensions/api/changes/RestoreInput.java | 0 .../extensions/api/changes/RevertInput.java | 0 .../extensions/api/changes/ReviewInput.java | 0 .../extensions/api/changes/ReviewResult.java | 0 .../extensions/api/changes/ReviewerApi.java | 0 .../extensions/api/changes/ReviewerInfo.java | 0 .../extensions/api/changes/RevisionApi.java | 0 .../api/changes/RevisionReviewerApi.java | 0 .../api/changes/RobotCommentApi.java | 0 .../extensions/api/changes/StarsInput.java | 0 .../extensions/api/changes/SubmitInput.java | 0 .../api/changes/SubmittedTogetherInfo.java | 0 .../api/changes/SubmittedTogetherOption.java | 0 .../extensions/api/changes/TopicInput.java | 0 .../api/config/AccessCheckInfo.java | 0 .../api/config/AccessCheckInput.java | 0 .../gerrit/extensions/api/config/Config.java | 0 .../api/config/ConsistencyCheckInfo.java | 0 .../api/config/ConsistencyCheckInput.java | 0 .../gerrit/extensions/api/config/Server.java | 0 .../extensions/api/groups/GroupApi.java | 0 .../extensions/api/groups/GroupInput.java | 0 .../gerrit/extensions/api/groups/Groups.java | 0 .../extensions/api/groups/OwnerInput.java | 0 .../extensions/api/lfs/LfsDefinitions.java | 0 .../extensions/api/plugins/PluginApi.java | 0 .../extensions/api/plugins/Plugins.java | 0 .../api/projects/BanCommitInput.java | 0 .../extensions/api/projects/BranchApi.java | 0 .../extensions/api/projects/BranchInfo.java | 0 .../extensions/api/projects/BranchInput.java | 0 .../api/projects/ChildProjectApi.java | 0 .../api/projects/CommentLinkInfo.java | 0 .../extensions/api/projects/CommitApi.java | 0 .../extensions/api/projects/ConfigInfo.java | 0 .../extensions/api/projects/ConfigInput.java | 0 .../extensions/api/projects/ConfigValue.java | 0 .../extensions/api/projects/DashboardApi.java | 0 .../api/projects/DashboardInfo.java | 0 .../api/projects/DashboardSectionInfo.java | 0 .../api/projects/DeleteBranchesInput.java | 0 .../api/projects/DeleteTagsInput.java | 0 .../api/projects/DescriptionInput.java | 0 .../extensions/api/projects/HeadInput.java | 0 .../extensions/api/projects/ParentInput.java | 0 .../extensions/api/projects/ProjectApi.java | 0 .../api/projects/ProjectConfigEntryType.java | 0 .../extensions/api/projects/ProjectInput.java | 0 .../extensions/api/projects/Projects.java | 0 .../extensions/api/projects/RefInfo.java | 0 .../api/projects/ReflogEntryInfo.java | 0 .../extensions/api/projects/TagApi.java | 0 .../extensions/api/projects/TagInfo.java | 0 .../extensions/api/projects/TagInput.java | 0 .../extensions/api/projects/ThemeInfo.java | 0 .../auth/oauth/OAuthLoginProvider.java | 0 .../auth/oauth/OAuthServiceProvider.java | 0 .../extensions/auth/oauth/OAuthToken.java | 0 .../auth/oauth/OAuthTokenEncrypter.java | 0 .../extensions/auth/oauth/OAuthUserInfo.java | 0 .../extensions/auth/oauth/OAuthVerifier.java | 0 .../extensions/client/AccountFieldName.java | 0 .../gerrit/extensions/client/AuthType.java | 0 .../gerrit/extensions/client/ChangeKind.java | 0 .../extensions/client/ChangeStatus.java | 0 .../gerrit/extensions/client/Comment.java | 0 .../client/DiffPreferencesInfo.java | 0 .../client/EditPreferencesInfo.java | 0 .../client/GeneralPreferencesInfo.java | 0 .../extensions/client/GerritTopMenu.java | 0 .../extensions/client/GitBasicAuthPolicy.java | 0 .../extensions/client/InheritableBoolean.java | 0 .../gerrit/extensions/client/KeyMapType.java | 0 .../extensions/client/ListAccountsOption.java | 0 .../extensions/client/ListChangesOption.java | 0 .../extensions/client/ListGroupsOption.java | 0 .../gerrit/extensions/client/MenuItem.java | 0 .../extensions/client/ProjectState.java | 0 .../extensions/client/ProjectWatchInfo.java | 0 .../extensions/client/ReviewerState.java | 0 .../google/gerrit/extensions/client/Side.java | 0 .../gerrit/extensions/client/SubmitType.java | 0 .../gerrit/extensions/client/Theme.java | 0 .../gerrit/extensions/client/UiType.java | 0 .../gerrit/extensions/client/testing/BUILD | 2 +- .../common/AccountExternalIdInfo.java | 0 .../gerrit/extensions/common/AccountInfo.java | 0 .../extensions/common/AccountVisibility.java | 0 .../extensions/common/AccountsInfo.java | 0 .../gerrit/extensions/common/ActionInfo.java | 0 .../extensions/common/AgreementInfo.java | 0 .../extensions/common/AgreementInput.java | 0 .../extensions/common/ApprovalInfo.java | 0 .../gerrit/extensions/common/AuthInfo.java | 0 .../gerrit/extensions/common/AvatarInfo.java | 0 .../gerrit/extensions/common/BlameInfo.java | 0 .../extensions/common/ChangeConfigInfo.java | 0 .../gerrit/extensions/common/ChangeInfo.java | 0 .../gerrit/extensions/common/ChangeInput.java | 0 .../extensions/common/ChangeMessageInfo.java | 0 .../gerrit/extensions/common/ChangeType.java | 0 .../gerrit/extensions/common/CommentInfo.java | 0 .../gerrit/extensions/common/CommitInfo.java | 0 .../extensions/common/CommitMessageInput.java | 0 .../extensions/common/DescriptionInput.java | 0 .../gerrit/extensions/common/DiffInfo.java | 0 .../extensions/common/DiffWebLinkInfo.java | 0 .../extensions/common/DownloadInfo.java | 0 .../extensions/common/DownloadSchemeInfo.java | 0 .../gerrit/extensions/common/EditInfo.java | 0 .../gerrit/extensions/common/EmailInfo.java | 0 .../gerrit/extensions/common/FetchInfo.java | 0 .../gerrit/extensions/common/FileInfo.java | 0 .../extensions/common/FixReplacementInfo.java | 0 .../extensions/common/FixSuggestionInfo.java | 0 .../gerrit/extensions/common/GerritInfo.java | 0 .../gerrit/extensions/common/GitPerson.java | 0 .../gerrit/extensions/common/GpgKeyInfo.java | 0 .../common/GroupAuditEventInfo.java | 0 .../extensions/common/GroupBaseInfo.java | 0 .../gerrit/extensions/common/GroupInfo.java | 0 .../extensions/common/GroupOptionsInfo.java | 0 .../extensions/common/HttpPasswordInput.java | 0 .../gerrit/extensions/common/Input.java | 0 .../extensions/common/InstallPluginInput.java | 0 .../gerrit/extensions/common/LabelInfo.java | 0 .../extensions/common/LabelTypeInfo.java | 0 .../gerrit/extensions/common/MergeInput.java | 0 .../extensions/common/MergePatchSetInput.java | 0 .../extensions/common/MergeableInfo.java | 0 .../gerrit/extensions/common/NameInput.java | 0 .../extensions/common/PluginConfigInfo.java | 0 .../extensions/common/PluginDefinedInfo.java | 0 .../gerrit/extensions/common/PluginInfo.java | 0 .../gerrit/extensions/common/ProblemInfo.java | 0 .../gerrit/extensions/common/ProjectInfo.java | 0 .../extensions/common/PureRevertInfo.java | 0 .../common/PushCertificateInfo.java | 0 .../gerrit/extensions/common/RangeInfo.java | 0 .../gerrit/extensions/common/ReceiveInfo.java | 0 .../extensions/common/ReviewerUpdateInfo.java | 0 .../extensions/common/RevisionInfo.java | 0 .../extensions/common/RobotCommentInfo.java | 0 .../gerrit/extensions/common/ServerInfo.java | 0 .../extensions/common/SetDashboardInput.java | 0 .../gerrit/extensions/common/SshKeyInfo.java | 0 .../gerrit/extensions/common/SshdInfo.java | 0 .../gerrit/extensions/common/SuggestInfo.java | 0 .../common/SuggestedReviewerInfo.java | 0 .../common/TestSubmitRuleInput.java | 0 .../extensions/common/TrackingIdInfo.java | 0 .../extensions/common/UserConfigInfo.java | 0 .../extensions/common/VotingRangeInfo.java | 0 .../gerrit/extensions/common/WebLinkInfo.java | 0 .../gerrit/extensions/common/testing/BUILD | 2 +- .../conditions/BooleanCondition.java | 0 .../PrivateInternals_BooleanCondition.java | 0 .../config/CapabilityDefinition.java | 0 .../extensions/config/CloneCommand.java | 0 .../extensions/config/DownloadCommand.java | 0 .../extensions/config/DownloadScheme.java | 0 .../extensions/config/ExternalIncludedIn.java | 0 .../extensions/config/FactoryModule.java | 0 .../events/AccountIndexedListener.java | 0 .../events/AgreementSignupListener.java | 0 .../events/AssigneeChangedListener.java | 0 .../events/ChangeAbandonedListener.java | 0 .../gerrit/extensions/events/ChangeEvent.java | 0 .../events/ChangeIndexedListener.java | 0 .../events/ChangeMergedListener.java | 0 .../events/ChangeRestoredListener.java | 0 .../events/ChangeRevertedListener.java | 0 .../events/CommentAddedListener.java | 0 .../events/GarbageCollectorListener.java | 0 .../gerrit/extensions/events/GerritEvent.java | 0 .../events/GitReferenceUpdatedListener.java | 0 .../events/GroupIndexedListener.java | 0 .../events/HashtagsEditedListener.java | 0 .../events/HeadUpdatedListener.java | 0 .../extensions/events/LifecycleListener.java | 0 .../events/NewProjectCreatedListener.java | 0 .../events/PluginEventListener.java | 0 .../events/ProjectDeletedListener.java | 0 .../extensions/events/ProjectEvent.java | 0 .../events/ProjectIndexedListener.java | 0 .../events/ReviewerAddedListener.java | 0 .../events/ReviewerDeletedListener.java | 0 .../events/RevisionCreatedListener.java | 0 .../extensions/events/RevisionEvent.java | 0 .../events/TopicEditedListener.java | 0 .../events/UsageDataPublishedListener.java | 0 .../events/VoteDeletedListener.java | 0 .../persistence/DataSourceInterceptor.java | 0 .../extensions/registration/DynamicItem.java | 0 .../registration/DynamicItemProvider.java | 0 .../extensions/registration/DynamicMap.java | 0 .../registration/DynamicMapProvider.java | 0 .../extensions/registration/DynamicSet.java | 0 .../registration/DynamicSetProvider.java | 0 .../PrivateInternals_DynamicMapImpl.java | 0 .../PrivateInternals_DynamicTypes.java | 0 .../registration/RegistrationHandle.java | 0 .../ReloadableRegistrationHandle.java | 0 .../extensions/restapi/AcceptsCreate.java | 0 .../extensions/restapi/AcceptsDelete.java | 0 .../extensions/restapi/AcceptsPost.java | 0 .../extensions/restapi/AuthException.java | 0 .../restapi/BadRequestException.java | 0 .../extensions/restapi/BinaryResult.java | 0 .../extensions/restapi/CacheControl.java | 0 .../extensions/restapi/ChildCollection.java | 0 .../extensions/restapi/DefaultInput.java | 0 .../gerrit/extensions/restapi/ETagView.java | 0 .../gerrit/extensions/restapi/IdString.java | 0 .../restapi/MergeConflictException.java | 0 .../restapi/MethodNotAllowedException.java | 0 .../extensions/restapi/NeedsParams.java | 0 .../restapi/NotImplementedException.java | 0 .../restapi/PreconditionFailedException.java | 0 .../gerrit/extensions/restapi/RawInput.java | 0 .../restapi/ResourceConflictException.java | 0 .../restapi/ResourceNotFoundException.java | 0 .../gerrit/extensions/restapi/Response.java | 0 .../extensions/restapi/RestApiException.java | 0 .../extensions/restapi/RestApiModule.java | 0 .../extensions/restapi/RestCollection.java | 0 .../extensions/restapi/RestModifyView.java | 0 .../extensions/restapi/RestReadView.java | 0 .../extensions/restapi/RestResource.java | 0 .../gerrit/extensions/restapi/RestView.java | 0 .../extensions/restapi/TopLevelResource.java | 0 .../restapi/UnprocessableEntityException.java | 0 .../google/gerrit/extensions/restapi/Url.java | 0 .../gerrit/extensions/restapi/testing/BUILD | 2 +- .../systemstatus/MessageOfTheDay.java | 0 .../systemstatus/ServerInformation.java | 0 .../extensions/webui/BranchWebLink.java | 0 .../gerrit/extensions/webui/DiffWebLink.java | 0 .../extensions/webui/FileHistoryWebLink.java | 0 .../gerrit/extensions/webui/FileWebLink.java | 0 .../gerrit/extensions/webui/GwtPlugin.java | 0 .../extensions/webui/JavaScriptPlugin.java | 0 .../extensions/webui/ParentWebLink.java | 0 .../extensions/webui/PatchSetWebLink.java | 0 .../PrivateInternals_UiActionDescription.java | 0 .../extensions/webui/ProjectWebLink.java | 0 .../gerrit/extensions/webui/TagWebLink.java | 0 .../gerrit/extensions/webui/TopMenu.java | 0 .../gerrit/extensions/webui/UiAction.java | 0 .../gerrit/extensions/webui/UiResult.java | 0 .../gerrit/extensions/webui/WebLink.java | 0 .../gerrit/extensions/webui/WebUiPlugin.java | 0 .../api/lfs/LfsDefinitionsTest.java | 0 .../gerrit/extensions/client/RangeTest.java | 0 .../registration/DynamicSetTest.java | 0 .../gr-rest-api-interface.js | 2 +- tools/eclipse/project.py | 1 + tools/maven/BUILD | 6 ++--- 338 files changed, 52 insertions(+), 66 deletions(-) rename {gerrit-extension-api => java/com/google/gerrit/extensions}/BUILD (68%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/Extensions.gwt.xml (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/CapabilityScope.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/Export.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/ExportImpl.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/Exports.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/ExtensionPoint.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/Listen.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/PluginCanonicalWebUrl.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/PluginData.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/PluginName.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/RequiresAnyCapability.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/RequiresCapability.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/annotations/RootRelative.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/GerritApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/access/AccessSectionInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/access/GlobalOrPluginPermission.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/access/PermissionInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/access/PermissionRuleInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/access/PluginPermission.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/access/ProjectAccessInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/access/ProjectAccessInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/accounts/AccountApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/accounts/AccountInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/accounts/Accounts.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/accounts/EmailInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/accounts/GpgKeysInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/accounts/SshKeyInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/accounts/StatusInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/accounts/UsernameInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/AbandonInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/ActionVisitor.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/AddReviewerInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/AddReviewerResult.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/AssigneeInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/ChangeApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/ChangeEditApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/Changes.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/CherryPickInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/CommentApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/DeleteCommentInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/DeleteReviewerInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/DeleteVoteInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/DraftApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/DraftInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/FileApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/FixInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/HashtagsInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/IncludedInInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/MoveInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/NotifyHandling.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/NotifyInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/PublishChangeEditInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/RebaseInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/RecipientType.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/RestoreInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/RevertInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/ReviewInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/ReviewResult.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/ReviewerApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/ReviewerInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/RevisionApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/RevisionReviewerApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/RobotCommentApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/StarsInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/SubmitInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/SubmittedTogetherInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/SubmittedTogetherOption.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/changes/TopicInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/config/AccessCheckInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/config/AccessCheckInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/config/Config.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/config/ConsistencyCheckInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/config/ConsistencyCheckInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/config/Server.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/groups/GroupApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/groups/GroupInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/groups/Groups.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/groups/OwnerInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/lfs/LfsDefinitions.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/plugins/PluginApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/plugins/Plugins.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/BanCommitInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/BranchApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/BranchInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/BranchInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/ChildProjectApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/CommentLinkInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/CommitApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/ConfigInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/ConfigInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/ConfigValue.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/DashboardApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/DashboardInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/DashboardSectionInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/DeleteBranchesInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/DeleteTagsInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/DescriptionInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/HeadInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/ParentInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/ProjectApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/ProjectConfigEntryType.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/ProjectInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/Projects.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/RefInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/ReflogEntryInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/TagApi.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/TagInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/TagInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/api/projects/ThemeInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/auth/oauth/OAuthLoginProvider.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/auth/oauth/OAuthServiceProvider.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/auth/oauth/OAuthToken.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/auth/oauth/OAuthTokenEncrypter.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/auth/oauth/OAuthUserInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/auth/oauth/OAuthVerifier.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/AccountFieldName.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/AuthType.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/ChangeKind.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/ChangeStatus.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/Comment.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/DiffPreferencesInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/EditPreferencesInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/GerritTopMenu.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/GitBasicAuthPolicy.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/InheritableBoolean.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/KeyMapType.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/ListAccountsOption.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/ListChangesOption.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/ListGroupsOption.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/MenuItem.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/ProjectState.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/ProjectWatchInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/ReviewerState.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/Side.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/SubmitType.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/Theme.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/client/UiType.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/AccountExternalIdInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/AccountInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/AccountVisibility.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/AccountsInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ActionInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/AgreementInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/AgreementInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ApprovalInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/AuthInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/AvatarInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/BlameInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ChangeConfigInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ChangeInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ChangeInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ChangeMessageInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ChangeType.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/CommentInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/CommitInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/CommitMessageInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/DescriptionInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/DiffInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/DiffWebLinkInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/DownloadInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/DownloadSchemeInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/EditInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/EmailInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/FetchInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/FileInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/FixReplacementInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/FixSuggestionInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/GerritInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/GitPerson.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/GpgKeyInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/GroupAuditEventInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/GroupBaseInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/GroupInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/GroupOptionsInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/HttpPasswordInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/Input.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/InstallPluginInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/LabelInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/LabelTypeInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/MergeInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/MergePatchSetInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/MergeableInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/NameInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/PluginConfigInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/PluginDefinedInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/PluginInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ProblemInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ProjectInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/PureRevertInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/PushCertificateInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/RangeInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ReceiveInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ReviewerUpdateInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/RevisionInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/RobotCommentInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/ServerInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/SetDashboardInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/SshKeyInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/SshdInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/SuggestInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/SuggestedReviewerInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/TestSubmitRuleInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/TrackingIdInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/UserConfigInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/VotingRangeInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/common/WebLinkInfo.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/conditions/BooleanCondition.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/conditions/PrivateInternals_BooleanCondition.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/config/CapabilityDefinition.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/config/CloneCommand.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/config/DownloadCommand.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/config/DownloadScheme.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/config/ExternalIncludedIn.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/config/FactoryModule.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/AccountIndexedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/AgreementSignupListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/AssigneeChangedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ChangeAbandonedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ChangeEvent.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ChangeIndexedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ChangeMergedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ChangeRestoredListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ChangeRevertedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/CommentAddedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/GarbageCollectorListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/GerritEvent.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/GitReferenceUpdatedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/GroupIndexedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/HashtagsEditedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/HeadUpdatedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/LifecycleListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/NewProjectCreatedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/PluginEventListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ProjectDeletedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ProjectEvent.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ProjectIndexedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ReviewerAddedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/ReviewerDeletedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/RevisionCreatedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/RevisionEvent.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/TopicEditedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/UsageDataPublishedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/events/VoteDeletedListener.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/persistence/DataSourceInterceptor.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/registration/DynamicItem.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/registration/DynamicItemProvider.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/registration/DynamicMap.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/registration/DynamicMapProvider.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/registration/DynamicSet.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/registration/DynamicSetProvider.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/registration/PrivateInternals_DynamicTypes.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/registration/RegistrationHandle.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/registration/ReloadableRegistrationHandle.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/AcceptsCreate.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/AcceptsDelete.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/AcceptsPost.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/AuthException.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/BadRequestException.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/BinaryResult.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/CacheControl.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/ChildCollection.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/DefaultInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/ETagView.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/IdString.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/MergeConflictException.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/MethodNotAllowedException.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/NeedsParams.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/NotImplementedException.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/PreconditionFailedException.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/RawInput.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/ResourceConflictException.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/ResourceNotFoundException.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/Response.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/RestApiException.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/RestApiModule.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/RestCollection.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/RestModifyView.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/RestReadView.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/RestResource.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/RestView.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/TopLevelResource.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/UnprocessableEntityException.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/restapi/Url.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/systemstatus/MessageOfTheDay.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/systemstatus/ServerInformation.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/BranchWebLink.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/DiffWebLink.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/FileHistoryWebLink.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/FileWebLink.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/GwtPlugin.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/JavaScriptPlugin.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/ParentWebLink.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/PatchSetWebLink.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/PrivateInternals_UiActionDescription.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/ProjectWebLink.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/TagWebLink.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/TopMenu.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/UiAction.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/UiResult.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/WebLink.java (100%) rename {gerrit-extension-api/src/main/java => java}/com/google/gerrit/extensions/webui/WebUiPlugin.java (100%) rename {gerrit-extension-api/src/test/java => javatests}/com/google/gerrit/extensions/api/lfs/LfsDefinitionsTest.java (100%) rename {gerrit-extension-api/src/test/java => javatests}/com/google/gerrit/extensions/client/RangeTest.java (100%) rename {gerrit-extension-api/src/test/java => javatests}/com/google/gerrit/extensions/registration/DynamicSetTest.java (100%) diff --git a/BUILD b/BUILD index 722e240851..e4618cdfee 100644 --- a/BUILD +++ b/BUILD @@ -48,9 +48,9 @@ API_DEPS = [ "//gerrit-acceptance-framework:acceptance-framework_deploy.jar", "//gerrit-acceptance-framework:liblib-src.jar", "//gerrit-acceptance-framework:acceptance-framework-javadoc", - "//gerrit-extension-api:extension-api_deploy.jar", - "//gerrit-extension-api:libapi-src.jar", - "//gerrit-extension-api:extension-api-javadoc", + "//java/com/google/gerrit/extensions:extension-api_deploy.jar", + "//java/com/google/gerrit/extensions:libapi-src.jar", + "//java/com/google/gerrit/extensions:extension-api-javadoc", "//gerrit-plugin-api:plugin-api_deploy.jar", "//gerrit-plugin-api:plugin-api-sources_deploy.jar", "//gerrit-plugin-api:plugin-api-javadoc", diff --git a/gerrit-acceptance-framework/BUILD b/gerrit-acceptance-framework/BUILD index 1495cf2e8e..d479ca492f 100644 --- a/gerrit-acceptance-framework/BUILD +++ b/gerrit-acceptance-framework/BUILD @@ -11,7 +11,7 @@ SRCS = glob( PROVIDED = [ "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//gerrit-httpd:httpd", "//gerrit-index:index", "//gerrit-lucene:lucene", diff --git a/gerrit-acceptance-tests/BUILD b/gerrit-acceptance-tests/BUILD index d7360651e3..ac9e4e4499 100644 --- a/gerrit-acceptance-tests/BUILD +++ b/gerrit-acceptance-tests/BUILD @@ -10,7 +10,6 @@ java_library( "//gerrit-acceptance-framework:lib", "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", "//gerrit-gpg:testutil", "//gerrit-httpd:httpd", "//gerrit-launcher:launcher", @@ -24,6 +23,7 @@ java_library( "//gerrit-server:server", "//gerrit-server:testutil", "//gerrit-sshd:sshd", + "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/extensions/common/testing:common-test-util", "//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util", "//lib:args4j", diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/BUILD index 1b90776524..8ed6c9b490 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/BUILD +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/BUILD @@ -14,9 +14,9 @@ java_library( name = "util", srcs = ["GroupAssert.java"], deps = [ - "//gerrit-extension-api:api", "//gerrit-reviewdb:server", "//gerrit-server:server", + "//java/com/google/gerrit/extensions:api", "//lib:gwtorm", "//lib:truth", ], diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD index fbe5d8067b..f8faa65368 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD @@ -17,8 +17,8 @@ java_library( "RefAssert.java", ], deps = [ - "//gerrit-extension-api:api", "//gerrit-server:server", + "//java/com/google/gerrit/extensions:api", "//lib:truth", ], ) @@ -29,9 +29,9 @@ java_library( "ProjectAssert.java", ], deps = [ - "//gerrit-extension-api:api", "//gerrit-reviewdb:server", "//gerrit-server:server", + "//java/com/google/gerrit/extensions:api", "//lib:gwtorm", "//lib:truth", ], diff --git a/gerrit-cache-h2/BUILD b/gerrit-cache-h2/BUILD index 45cf4167a4..4a3b32c4f5 100644 --- a/gerrit-cache-h2/BUILD +++ b/gerrit-cache-h2/BUILD @@ -6,8 +6,8 @@ java_library( visibility = ["//visibility:public"], deps = [ "//gerrit-common:server", - "//gerrit-extension-api:api", "//gerrit-server:server", + "//java/com/google/gerrit/extensions:api", "//lib:guava", "//lib:h2", "//lib/guice", diff --git a/gerrit-common/BUILD b/gerrit-common/BUILD index d9d4392f5c..3b326725de 100644 --- a/gerrit-common/BUILD +++ b/gerrit-common/BUILD @@ -22,8 +22,8 @@ gwt_module( name = "client", srcs = glob([SRC + "common/**/*.java"]), exported_deps = [ - "//gerrit-extension-api:api", "//gerrit-prettify:client", + "//java/com/google/gerrit/extensions:api", "//lib:guava", "//lib:gwtorm_client", "//lib:servlet-api-3_1", @@ -43,10 +43,10 @@ java_library( visibility = ["//visibility:public"], deps = [ ":annotations", - "//gerrit-extension-api:api", "//gerrit-patch-jgit:server", "//gerrit-prettify:server", "//gerrit-reviewdb:server", + "//java/com/google/gerrit/extensions:api", "//lib:guava", "//lib:gwtjsonrpc", "//lib:gwtorm", diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD index d278bcf926..ee878a5d9d 100644 --- a/gerrit-elasticsearch/BUILD +++ b/gerrit-elasticsearch/BUILD @@ -3,11 +3,11 @@ java_library( srcs = glob(["src/main/java/**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//gerrit-extension-api:api", "//gerrit-index:index", "//gerrit-index:query_exception", "//gerrit-reviewdb:server", "//gerrit-server:server", + "//java/com/google/gerrit/extensions:api", "//lib:gson", "//lib:guava", "//lib:gwtorm", @@ -35,10 +35,10 @@ java_library( srcs = glob(["src/test/java/**/ElasticTestUtils.java"]), deps = [ ":elasticsearch", - "//gerrit-extension-api:api", "//gerrit-index:index", "//gerrit-reviewdb:server", "//gerrit-server:server", + "//java/com/google/gerrit/extensions:api", "//lib:gson", "//lib:guava", "//lib:junit", diff --git a/gerrit-gpg/BUILD b/gerrit-gpg/BUILD index 680071f3da..1b42927564 100644 --- a/gerrit-gpg/BUILD +++ b/gerrit-gpg/BUILD @@ -2,7 +2,7 @@ load("//tools/bzl:junit.bzl", "junit_tests") DEPS = [ "//gerrit-common:server", - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//gerrit-reviewdb:server", "//gerrit-server:server", "//lib:guava", diff --git a/gerrit-gwtui/BUILD b/gerrit-gwtui/BUILD index ff1b86226d..77961cf0ac 100644 --- a/gerrit-gwtui/BUILD +++ b/gerrit-gwtui/BUILD @@ -32,7 +32,7 @@ junit_tests( deps = [ ":ui_module", "//gerrit-common:client", - "//gerrit-extension-api:client", + "//java/com/google/gerrit/extensions:client", "//lib:junit", "//lib:truth", "//lib/gwt:dev", diff --git a/gerrit-httpd/BUILD b/gerrit-httpd/BUILD index cc2160f37d..0f25a888aa 100644 --- a/gerrit-httpd/BUILD +++ b/gerrit-httpd/BUILD @@ -18,7 +18,6 @@ java_library( deps = [ "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", "//gerrit-gwtexpui:linker_server", "//gerrit-gwtexpui:server", "//gerrit-index:query_exception", @@ -31,6 +30,7 @@ java_library( "//gerrit-server:server", "//gerrit-util-cli:cli", "//gerrit-util-http:http", + "//java/com/google/gerrit/extensions:api", "//lib:args4j", "//lib:gson", "//lib:guava", @@ -59,11 +59,11 @@ junit_tests( ":httpd", "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", "//gerrit-reviewdb:server", "//gerrit-server:server", "//gerrit-util-http:http", "//gerrit-util-http:testutil", + "//java/com/google/gerrit/extensions:api", "//lib:gson", "//lib:guava", "//lib:gwtorm", diff --git a/gerrit-index/BUILD b/gerrit-index/BUILD index 11c4f08254..470574c81e 100644 --- a/gerrit-index/BUILD +++ b/gerrit-index/BUILD @@ -48,8 +48,8 @@ java_library( ":query_exception", ":query_parser", "//gerrit-common:annotations", - "//gerrit-extension-api:api", "//gerrit-server:metrics", + "//java/com/google/gerrit/extensions:api", "//lib:guava", "//lib:gwtjsonrpc", "//lib:gwtorm", diff --git a/gerrit-lucene/BUILD b/gerrit-lucene/BUILD index aae50001ed..0e2d61a032 100644 --- a/gerrit-lucene/BUILD +++ b/gerrit-lucene/BUILD @@ -28,11 +28,11 @@ java_library( ":query_builder", "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", "//gerrit-index:index", "//gerrit-index:query_exception", "//gerrit-reviewdb:server", "//gerrit-server:server", + "//java/com/google/gerrit/extensions:api", "//lib:guava", "//lib:gwtorm", "//lib/guice", diff --git a/gerrit-oauth/BUILD b/gerrit-oauth/BUILD index 0ef89c0378..2e89b541ea 100644 --- a/gerrit-oauth/BUILD +++ b/gerrit-oauth/BUILD @@ -11,10 +11,10 @@ java_library( visibility = ["//visibility:public"], deps = [ "//gerrit-common:annotations", - "//gerrit-extension-api:api", "//gerrit-httpd:httpd", "//gerrit-reviewdb:server", "//gerrit-server:server", + "//java/com/google/gerrit/extensions:api", "//lib:gson", "//lib:guava", "//lib:gwtorm", diff --git a/gerrit-openid/BUILD b/gerrit-openid/BUILD index 7b0d2b1e59..ae35076252 100644 --- a/gerrit-openid/BUILD +++ b/gerrit-openid/BUILD @@ -7,7 +7,7 @@ java_library( # We want all these deps to be provided_deps "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//gerrit-gwtexpui:server", "//gerrit-httpd:httpd", "//gerrit-reviewdb:server", diff --git a/gerrit-pgm/BUILD b/gerrit-pgm/BUILD index 60663d76ed..5614860aa8 100644 --- a/gerrit-pgm/BUILD +++ b/gerrit-pgm/BUILD @@ -11,7 +11,7 @@ INIT_API_SRCS = glob([SRCS + "init/api/*.java"]) BASE_JETTY_DEPS = [ "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//gerrit-gwtexpui:linker_server", "//gerrit-gwtexpui:server", "//gerrit-httpd:httpd", diff --git a/gerrit-plugin-api/BUILD b/gerrit-plugin-api/BUILD index 419ef7da7a..ac279dccf0 100644 --- a/gerrit-plugin-api/BUILD +++ b/gerrit-plugin-api/BUILD @@ -11,7 +11,7 @@ EXPORTS = [ "//gerrit-index:query_parser", "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//gerrit-gwtexpui:server", "//gerrit-server:metrics", "//gerrit-reviewdb:server", @@ -76,7 +76,6 @@ java_binary( visibility = ["//visibility:public"], runtime_deps = [ "//gerrit-common:libannotations-src.jar", - "//gerrit-extension-api:libapi-src.jar", "//gerrit-gwtexpui:libserver-src.jar", "//gerrit-httpd:libhttpd-src.jar", "//gerrit-index:libquery_exception-src.jar", @@ -85,6 +84,7 @@ java_binary( "//gerrit-reviewdb:libserver-src.jar", "//gerrit-server:libserver-src.jar", "//gerrit-sshd:libsshd-src.jar", + "//java/com/google/gerrit/extensions:libapi-src.jar", ], ) @@ -97,7 +97,7 @@ java_doc( "//gerrit-index:query_parser", "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//gerrit-gwtexpui:server", "//gerrit-reviewdb:server", ], diff --git a/gerrit-plugin-gwtui/BUILD b/gerrit-plugin-gwtui/BUILD index f8960502aa..9aaef31d4a 100644 --- a/gerrit-plugin-gwtui/BUILD +++ b/gerrit-plugin-gwtui/BUILD @@ -22,7 +22,7 @@ java_library2( resources = glob(["src/main/**/*"]), deps = DEPS + [ "//gerrit-common:libclient-src.jar", - "//gerrit-extension-api:libclient-src.jar", + "//java/com/google/gerrit/extensions:libclient-src.jar", "//gerrit-gwtexpui:libClippy-src.jar", "//gerrit-gwtexpui:libGlobalKey-src.jar", "//gerrit-gwtexpui:libProgress-src.jar", diff --git a/gerrit-prettify/BUILD b/gerrit-prettify/BUILD index 18180b3680..4e39180f98 100644 --- a/gerrit-prettify/BUILD +++ b/gerrit-prettify/BUILD @@ -8,11 +8,11 @@ gwt_module( SRC + "common/**/*.java", ]), exported_deps = [ - "//gerrit-extension-api:client", "//gerrit-gwtexpui:SafeHtml", "//gerrit-patch-jgit:Edit", "//gerrit-patch-jgit:client", "//gerrit-reviewdb:client", + "//java/com/google/gerrit/extensions:client", "//lib:gwtjsonrpc", "//lib:gwtjsonrpc_src", ], diff --git a/gerrit-reviewdb/BUILD b/gerrit-reviewdb/BUILD index 98af668577..35149d56d3 100644 --- a/gerrit-reviewdb/BUILD +++ b/gerrit-reviewdb/BUILD @@ -15,7 +15,7 @@ gwt_module( gwt_xml = SRC + "ReviewDB.gwt.xml", visibility = ["//visibility:public"], deps = [ - "//gerrit-extension-api:client", + "//java/com/google/gerrit/extensions:client", "//lib:gwtorm_client", "//lib:gwtorm_client_src", ], @@ -27,7 +27,7 @@ java_library( resources = glob(["src/main/resources/**/*"]), visibility = ["//visibility:public"], deps = [ - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//lib:guava", "//lib:gwtorm", ], diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD index c78fc11924..f79b5b8992 100644 --- a/gerrit-server/BUILD +++ b/gerrit-server/BUILD @@ -42,7 +42,6 @@ java_library( ":metrics", "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", "//gerrit-index:index", "//gerrit-index:query_exception", "//gerrit-patch-commonsnet:commons-net", @@ -51,6 +50,7 @@ java_library( "//gerrit-reviewdb:server", "//gerrit-util-cli:cli", "//gerrit-util-ssl:ssl", + "//java/com/google/gerrit/extensions:api", "//lib:args4j", "//lib:automaton", "//lib:blame-cache", @@ -108,7 +108,7 @@ java_library( deps = [ ":receive", ":server", - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//lib:blame-cache", "//lib:guava", "//lib:soy", @@ -125,9 +125,9 @@ java_library( ":server", "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", "//gerrit-reviewdb:server", "//gerrit-util-cli:cli", + "//java/com/google/gerrit/extensions:api", "//lib:args4j", "//lib:guava", "//lib:gwtorm", @@ -146,7 +146,7 @@ java_library( srcs = METRICS_SRCS, visibility = ["//visibility:public"], deps = [ - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//lib:guava", ], ) @@ -158,7 +158,7 @@ TESTUTIL_DEPS = [ "//gerrit-common:annotations", "//gerrit-common:server", "//gerrit-cache-h2:cache-h2", - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//gerrit-gpg:gpg", "//gerrit-index:index", "//gerrit-lucene:lucene", @@ -215,7 +215,7 @@ java_library( srcs = CUSTOM_TRUTH_SUBJECTS, deps = [ ":server", - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/truth", "//lib:truth", ], @@ -238,7 +238,7 @@ java_library( ":server", ":testutil", "//gerrit-common:server", - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//lib:guava", "//lib:junit", "//lib:truth", diff --git a/gerrit-sshd/BUILD b/gerrit-sshd/BUILD index 6dd0d5fa43..e749b41423 100644 --- a/gerrit-sshd/BUILD +++ b/gerrit-sshd/BUILD @@ -10,7 +10,6 @@ java_library( "//gerrit-cache-h2:cache-h2", "//gerrit-common:annotations", "//gerrit-common:server", - "//gerrit-extension-api:api", "//gerrit-lucene:lucene", "//gerrit-patch-jgit:server", "//gerrit-reviewdb:server", @@ -18,6 +17,7 @@ java_library( "//gerrit-server:receive", "//gerrit-server:server", "//gerrit-util-cli:cli", + "//java/com/google/gerrit/extensions:api", "//lib:args4j", "//lib:gson", "//lib:guava", @@ -47,8 +47,8 @@ junit_tests( ), deps = [ ":sshd", - "//gerrit-extension-api:api", "//gerrit-server:server", + "//java/com/google/gerrit/extensions:api", "//lib:truth", "//lib/mina:sshd", ], diff --git a/gerrit-util-http/BUILD b/gerrit-util-http/BUILD index 47cc62e563..50f38992d7 100644 --- a/gerrit-util-http/BUILD +++ b/gerrit-util-http/BUILD @@ -15,7 +15,7 @@ java_library( srcs = TESTUTIL_SRCS, visibility = ["//visibility:public"], deps = [ - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//lib:guava", "//lib:servlet-api-3_1", "//lib/httpcomponents:httpclient", diff --git a/gerrit-war/BUILD b/gerrit-war/BUILD index dcd9625511..eea056c69a 100644 --- a/gerrit-war/BUILD +++ b/gerrit-war/BUILD @@ -7,7 +7,6 @@ java_library( deps = [ "//gerrit-cache-h2:cache-h2", "//gerrit-elasticsearch:elasticsearch", - "//gerrit-extension-api:api", "//gerrit-gpg:gpg", "//gerrit-httpd:httpd", "//gerrit-lucene:lucene", @@ -22,6 +21,7 @@ java_library( "//gerrit-server:receive", "//gerrit-server:server", "//gerrit-sshd:sshd", + "//java/com/google/gerrit/extensions:api", "//lib:guava", "//lib:gwtorm", "//lib:servlet-api-3_1", diff --git a/gerrit-extension-api/BUILD b/java/com/google/gerrit/extensions/BUILD similarity index 68% rename from gerrit-extension-api/BUILD rename to java/com/google/gerrit/extensions/BUILD index 4e0ff33d0f..dfd2390dec 100644 --- a/gerrit-extension-api/BUILD +++ b/java/com/google/gerrit/extensions/BUILD @@ -1,18 +1,15 @@ load("//lib:guava.bzl", "GUAVA_DOC_URL") load("//lib/jgit:jgit.bzl", "JGIT_DOC_URL") load("//tools/bzl:gwt.bzl", "gwt_module") -load("//tools/bzl:junit.bzl", "junit_tests") -SRC = "src/main/java/com/google/gerrit/extensions/" +SRCS = glob(["**/*.java"]) -SRCS = glob([SRC + "**/*.java"]) - -EXT_API_SRCS = glob([SRC + "client/*.java"]) +EXT_API_SRCS = glob(["client/*.java"]) gwt_module( name = "client", srcs = EXT_API_SRCS, - gwt_xml = SRC + "Extensions.gwt.xml", + gwt_xml = "Extensions.gwt.xml", visibility = ["//visibility:public"], ) @@ -39,7 +36,7 @@ java_library( #TODO(davido): There is no provided_deps argument to java_library rule java_library( name = "api", - srcs = glob([SRC + "**/*.java"]), + srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ "//gerrit-common:annotations", @@ -49,18 +46,6 @@ java_library( ], ) -junit_tests( - name = "api_tests", - srcs = glob(["src/test/java/**/*Test.java"]), - deps = [ - ":api", - "//java/com/google/gerrit/extensions/client/testing:client-test-util", - "//java/com/google/gerrit/extensions/common/testing:common-test-util", - "//lib:truth", - "//lib/guice", - ], -) - load("//tools/bzl:javadoc.bzl", "java_doc") java_doc( diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/Extensions.gwt.xml b/java/com/google/gerrit/extensions/Extensions.gwt.xml similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/Extensions.gwt.xml rename to java/com/google/gerrit/extensions/Extensions.gwt.xml diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/CapabilityScope.java b/java/com/google/gerrit/extensions/annotations/CapabilityScope.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/CapabilityScope.java rename to java/com/google/gerrit/extensions/annotations/CapabilityScope.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/Export.java b/java/com/google/gerrit/extensions/annotations/Export.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/Export.java rename to java/com/google/gerrit/extensions/annotations/Export.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/ExportImpl.java b/java/com/google/gerrit/extensions/annotations/ExportImpl.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/ExportImpl.java rename to java/com/google/gerrit/extensions/annotations/ExportImpl.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/Exports.java b/java/com/google/gerrit/extensions/annotations/Exports.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/Exports.java rename to java/com/google/gerrit/extensions/annotations/Exports.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/ExtensionPoint.java b/java/com/google/gerrit/extensions/annotations/ExtensionPoint.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/ExtensionPoint.java rename to java/com/google/gerrit/extensions/annotations/ExtensionPoint.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/Listen.java b/java/com/google/gerrit/extensions/annotations/Listen.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/Listen.java rename to java/com/google/gerrit/extensions/annotations/Listen.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/PluginCanonicalWebUrl.java b/java/com/google/gerrit/extensions/annotations/PluginCanonicalWebUrl.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/PluginCanonicalWebUrl.java rename to java/com/google/gerrit/extensions/annotations/PluginCanonicalWebUrl.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/PluginData.java b/java/com/google/gerrit/extensions/annotations/PluginData.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/PluginData.java rename to java/com/google/gerrit/extensions/annotations/PluginData.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/PluginName.java b/java/com/google/gerrit/extensions/annotations/PluginName.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/PluginName.java rename to java/com/google/gerrit/extensions/annotations/PluginName.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/RequiresAnyCapability.java b/java/com/google/gerrit/extensions/annotations/RequiresAnyCapability.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/RequiresAnyCapability.java rename to java/com/google/gerrit/extensions/annotations/RequiresAnyCapability.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/RequiresCapability.java b/java/com/google/gerrit/extensions/annotations/RequiresCapability.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/RequiresCapability.java rename to java/com/google/gerrit/extensions/annotations/RequiresCapability.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/RootRelative.java b/java/com/google/gerrit/extensions/annotations/RootRelative.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/annotations/RootRelative.java rename to java/com/google/gerrit/extensions/annotations/RootRelative.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/GerritApi.java b/java/com/google/gerrit/extensions/api/GerritApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/GerritApi.java rename to java/com/google/gerrit/extensions/api/GerritApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/AccessSectionInfo.java b/java/com/google/gerrit/extensions/api/access/AccessSectionInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/AccessSectionInfo.java rename to java/com/google/gerrit/extensions/api/access/AccessSectionInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/GlobalOrPluginPermission.java b/java/com/google/gerrit/extensions/api/access/GlobalOrPluginPermission.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/GlobalOrPluginPermission.java rename to java/com/google/gerrit/extensions/api/access/GlobalOrPluginPermission.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/PermissionInfo.java b/java/com/google/gerrit/extensions/api/access/PermissionInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/PermissionInfo.java rename to java/com/google/gerrit/extensions/api/access/PermissionInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/PermissionRuleInfo.java b/java/com/google/gerrit/extensions/api/access/PermissionRuleInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/PermissionRuleInfo.java rename to java/com/google/gerrit/extensions/api/access/PermissionRuleInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/PluginPermission.java b/java/com/google/gerrit/extensions/api/access/PluginPermission.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/PluginPermission.java rename to java/com/google/gerrit/extensions/api/access/PluginPermission.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/ProjectAccessInfo.java b/java/com/google/gerrit/extensions/api/access/ProjectAccessInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/ProjectAccessInfo.java rename to java/com/google/gerrit/extensions/api/access/ProjectAccessInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/ProjectAccessInput.java b/java/com/google/gerrit/extensions/api/access/ProjectAccessInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/access/ProjectAccessInput.java rename to java/com/google/gerrit/extensions/api/access/ProjectAccessInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountApi.java b/java/com/google/gerrit/extensions/api/accounts/AccountApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountApi.java rename to java/com/google/gerrit/extensions/api/accounts/AccountApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountInput.java b/java/com/google/gerrit/extensions/api/accounts/AccountInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountInput.java rename to java/com/google/gerrit/extensions/api/accounts/AccountInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/Accounts.java b/java/com/google/gerrit/extensions/api/accounts/Accounts.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/Accounts.java rename to java/com/google/gerrit/extensions/api/accounts/Accounts.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/EmailInput.java b/java/com/google/gerrit/extensions/api/accounts/EmailInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/EmailInput.java rename to java/com/google/gerrit/extensions/api/accounts/EmailInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java b/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java rename to java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeysInput.java b/java/com/google/gerrit/extensions/api/accounts/GpgKeysInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeysInput.java rename to java/com/google/gerrit/extensions/api/accounts/GpgKeysInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/SshKeyInput.java b/java/com/google/gerrit/extensions/api/accounts/SshKeyInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/SshKeyInput.java rename to java/com/google/gerrit/extensions/api/accounts/SshKeyInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/StatusInput.java b/java/com/google/gerrit/extensions/api/accounts/StatusInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/StatusInput.java rename to java/com/google/gerrit/extensions/api/accounts/StatusInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/UsernameInput.java b/java/com/google/gerrit/extensions/api/accounts/UsernameInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/UsernameInput.java rename to java/com/google/gerrit/extensions/api/accounts/UsernameInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/AbandonInput.java b/java/com/google/gerrit/extensions/api/changes/AbandonInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/AbandonInput.java rename to java/com/google/gerrit/extensions/api/changes/AbandonInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ActionVisitor.java b/java/com/google/gerrit/extensions/api/changes/ActionVisitor.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ActionVisitor.java rename to java/com/google/gerrit/extensions/api/changes/ActionVisitor.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/AddReviewerInput.java b/java/com/google/gerrit/extensions/api/changes/AddReviewerInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/AddReviewerInput.java rename to java/com/google/gerrit/extensions/api/changes/AddReviewerInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/AddReviewerResult.java b/java/com/google/gerrit/extensions/api/changes/AddReviewerResult.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/AddReviewerResult.java rename to java/com/google/gerrit/extensions/api/changes/AddReviewerResult.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/AssigneeInput.java b/java/com/google/gerrit/extensions/api/changes/AssigneeInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/AssigneeInput.java rename to java/com/google/gerrit/extensions/api/changes/AssigneeInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java b/java/com/google/gerrit/extensions/api/changes/ChangeApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java rename to java/com/google/gerrit/extensions/api/changes/ChangeApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeEditApi.java b/java/com/google/gerrit/extensions/api/changes/ChangeEditApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeEditApi.java rename to java/com/google/gerrit/extensions/api/changes/ChangeEditApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java b/java/com/google/gerrit/extensions/api/changes/Changes.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java rename to java/com/google/gerrit/extensions/api/changes/Changes.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CherryPickInput.java b/java/com/google/gerrit/extensions/api/changes/CherryPickInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CherryPickInput.java rename to java/com/google/gerrit/extensions/api/changes/CherryPickInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CommentApi.java b/java/com/google/gerrit/extensions/api/changes/CommentApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CommentApi.java rename to java/com/google/gerrit/extensions/api/changes/CommentApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DeleteCommentInput.java b/java/com/google/gerrit/extensions/api/changes/DeleteCommentInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DeleteCommentInput.java rename to java/com/google/gerrit/extensions/api/changes/DeleteCommentInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DeleteReviewerInput.java b/java/com/google/gerrit/extensions/api/changes/DeleteReviewerInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DeleteReviewerInput.java rename to java/com/google/gerrit/extensions/api/changes/DeleteReviewerInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DeleteVoteInput.java b/java/com/google/gerrit/extensions/api/changes/DeleteVoteInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DeleteVoteInput.java rename to java/com/google/gerrit/extensions/api/changes/DeleteVoteInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftApi.java b/java/com/google/gerrit/extensions/api/changes/DraftApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftApi.java rename to java/com/google/gerrit/extensions/api/changes/DraftApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftInput.java b/java/com/google/gerrit/extensions/api/changes/DraftInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftInput.java rename to java/com/google/gerrit/extensions/api/changes/DraftInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FileApi.java b/java/com/google/gerrit/extensions/api/changes/FileApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FileApi.java rename to java/com/google/gerrit/extensions/api/changes/FileApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FixInput.java b/java/com/google/gerrit/extensions/api/changes/FixInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FixInput.java rename to java/com/google/gerrit/extensions/api/changes/FixInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/HashtagsInput.java b/java/com/google/gerrit/extensions/api/changes/HashtagsInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/HashtagsInput.java rename to java/com/google/gerrit/extensions/api/changes/HashtagsInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/IncludedInInfo.java b/java/com/google/gerrit/extensions/api/changes/IncludedInInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/IncludedInInfo.java rename to java/com/google/gerrit/extensions/api/changes/IncludedInInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/MoveInput.java b/java/com/google/gerrit/extensions/api/changes/MoveInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/MoveInput.java rename to java/com/google/gerrit/extensions/api/changes/MoveInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/NotifyHandling.java b/java/com/google/gerrit/extensions/api/changes/NotifyHandling.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/NotifyHandling.java rename to java/com/google/gerrit/extensions/api/changes/NotifyHandling.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/NotifyInfo.java b/java/com/google/gerrit/extensions/api/changes/NotifyInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/NotifyInfo.java rename to java/com/google/gerrit/extensions/api/changes/NotifyInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/PublishChangeEditInput.java b/java/com/google/gerrit/extensions/api/changes/PublishChangeEditInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/PublishChangeEditInput.java rename to java/com/google/gerrit/extensions/api/changes/PublishChangeEditInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RebaseInput.java b/java/com/google/gerrit/extensions/api/changes/RebaseInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RebaseInput.java rename to java/com/google/gerrit/extensions/api/changes/RebaseInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RecipientType.java b/java/com/google/gerrit/extensions/api/changes/RecipientType.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RecipientType.java rename to java/com/google/gerrit/extensions/api/changes/RecipientType.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RestoreInput.java b/java/com/google/gerrit/extensions/api/changes/RestoreInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RestoreInput.java rename to java/com/google/gerrit/extensions/api/changes/RestoreInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevertInput.java b/java/com/google/gerrit/extensions/api/changes/RevertInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevertInput.java rename to java/com/google/gerrit/extensions/api/changes/RevertInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewInput.java b/java/com/google/gerrit/extensions/api/changes/ReviewInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewInput.java rename to java/com/google/gerrit/extensions/api/changes/ReviewInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewResult.java b/java/com/google/gerrit/extensions/api/changes/ReviewResult.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewResult.java rename to java/com/google/gerrit/extensions/api/changes/ReviewResult.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewerApi.java b/java/com/google/gerrit/extensions/api/changes/ReviewerApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewerApi.java rename to java/com/google/gerrit/extensions/api/changes/ReviewerApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewerInfo.java b/java/com/google/gerrit/extensions/api/changes/ReviewerInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewerInfo.java rename to java/com/google/gerrit/extensions/api/changes/ReviewerInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java b/java/com/google/gerrit/extensions/api/changes/RevisionApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java rename to java/com/google/gerrit/extensions/api/changes/RevisionApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionReviewerApi.java b/java/com/google/gerrit/extensions/api/changes/RevisionReviewerApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionReviewerApi.java rename to java/com/google/gerrit/extensions/api/changes/RevisionReviewerApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RobotCommentApi.java b/java/com/google/gerrit/extensions/api/changes/RobotCommentApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RobotCommentApi.java rename to java/com/google/gerrit/extensions/api/changes/RobotCommentApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/StarsInput.java b/java/com/google/gerrit/extensions/api/changes/StarsInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/StarsInput.java rename to java/com/google/gerrit/extensions/api/changes/StarsInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/SubmitInput.java b/java/com/google/gerrit/extensions/api/changes/SubmitInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/SubmitInput.java rename to java/com/google/gerrit/extensions/api/changes/SubmitInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/SubmittedTogetherInfo.java b/java/com/google/gerrit/extensions/api/changes/SubmittedTogetherInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/SubmittedTogetherInfo.java rename to java/com/google/gerrit/extensions/api/changes/SubmittedTogetherInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/SubmittedTogetherOption.java b/java/com/google/gerrit/extensions/api/changes/SubmittedTogetherOption.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/SubmittedTogetherOption.java rename to java/com/google/gerrit/extensions/api/changes/SubmittedTogetherOption.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/TopicInput.java b/java/com/google/gerrit/extensions/api/changes/TopicInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/TopicInput.java rename to java/com/google/gerrit/extensions/api/changes/TopicInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/AccessCheckInfo.java b/java/com/google/gerrit/extensions/api/config/AccessCheckInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/AccessCheckInfo.java rename to java/com/google/gerrit/extensions/api/config/AccessCheckInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/AccessCheckInput.java b/java/com/google/gerrit/extensions/api/config/AccessCheckInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/AccessCheckInput.java rename to java/com/google/gerrit/extensions/api/config/AccessCheckInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Config.java b/java/com/google/gerrit/extensions/api/config/Config.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Config.java rename to java/com/google/gerrit/extensions/api/config/Config.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/ConsistencyCheckInfo.java b/java/com/google/gerrit/extensions/api/config/ConsistencyCheckInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/ConsistencyCheckInfo.java rename to java/com/google/gerrit/extensions/api/config/ConsistencyCheckInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/ConsistencyCheckInput.java b/java/com/google/gerrit/extensions/api/config/ConsistencyCheckInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/ConsistencyCheckInput.java rename to java/com/google/gerrit/extensions/api/config/ConsistencyCheckInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Server.java b/java/com/google/gerrit/extensions/api/config/Server.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Server.java rename to java/com/google/gerrit/extensions/api/config/Server.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/GroupApi.java b/java/com/google/gerrit/extensions/api/groups/GroupApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/GroupApi.java rename to java/com/google/gerrit/extensions/api/groups/GroupApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/GroupInput.java b/java/com/google/gerrit/extensions/api/groups/GroupInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/GroupInput.java rename to java/com/google/gerrit/extensions/api/groups/GroupInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/Groups.java b/java/com/google/gerrit/extensions/api/groups/Groups.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/Groups.java rename to java/com/google/gerrit/extensions/api/groups/Groups.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/OwnerInput.java b/java/com/google/gerrit/extensions/api/groups/OwnerInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/OwnerInput.java rename to java/com/google/gerrit/extensions/api/groups/OwnerInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/lfs/LfsDefinitions.java b/java/com/google/gerrit/extensions/api/lfs/LfsDefinitions.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/lfs/LfsDefinitions.java rename to java/com/google/gerrit/extensions/api/lfs/LfsDefinitions.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/plugins/PluginApi.java b/java/com/google/gerrit/extensions/api/plugins/PluginApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/plugins/PluginApi.java rename to java/com/google/gerrit/extensions/api/plugins/PluginApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/plugins/Plugins.java b/java/com/google/gerrit/extensions/api/plugins/Plugins.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/plugins/Plugins.java rename to java/com/google/gerrit/extensions/api/plugins/Plugins.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BanCommitInput.java b/java/com/google/gerrit/extensions/api/projects/BanCommitInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BanCommitInput.java rename to java/com/google/gerrit/extensions/api/projects/BanCommitInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java b/java/com/google/gerrit/extensions/api/projects/BranchApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java rename to java/com/google/gerrit/extensions/api/projects/BranchApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchInfo.java b/java/com/google/gerrit/extensions/api/projects/BranchInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchInfo.java rename to java/com/google/gerrit/extensions/api/projects/BranchInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchInput.java b/java/com/google/gerrit/extensions/api/projects/BranchInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchInput.java rename to java/com/google/gerrit/extensions/api/projects/BranchInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java b/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java rename to java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/CommentLinkInfo.java b/java/com/google/gerrit/extensions/api/projects/CommentLinkInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/CommentLinkInfo.java rename to java/com/google/gerrit/extensions/api/projects/CommentLinkInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/CommitApi.java b/java/com/google/gerrit/extensions/api/projects/CommitApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/CommitApi.java rename to java/com/google/gerrit/extensions/api/projects/CommitApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ConfigInfo.java b/java/com/google/gerrit/extensions/api/projects/ConfigInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ConfigInfo.java rename to java/com/google/gerrit/extensions/api/projects/ConfigInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ConfigInput.java b/java/com/google/gerrit/extensions/api/projects/ConfigInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ConfigInput.java rename to java/com/google/gerrit/extensions/api/projects/ConfigInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ConfigValue.java b/java/com/google/gerrit/extensions/api/projects/ConfigValue.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ConfigValue.java rename to java/com/google/gerrit/extensions/api/projects/ConfigValue.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DashboardApi.java b/java/com/google/gerrit/extensions/api/projects/DashboardApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DashboardApi.java rename to java/com/google/gerrit/extensions/api/projects/DashboardApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DashboardInfo.java b/java/com/google/gerrit/extensions/api/projects/DashboardInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DashboardInfo.java rename to java/com/google/gerrit/extensions/api/projects/DashboardInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DashboardSectionInfo.java b/java/com/google/gerrit/extensions/api/projects/DashboardSectionInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DashboardSectionInfo.java rename to java/com/google/gerrit/extensions/api/projects/DashboardSectionInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DeleteBranchesInput.java b/java/com/google/gerrit/extensions/api/projects/DeleteBranchesInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DeleteBranchesInput.java rename to java/com/google/gerrit/extensions/api/projects/DeleteBranchesInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DeleteTagsInput.java b/java/com/google/gerrit/extensions/api/projects/DeleteTagsInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DeleteTagsInput.java rename to java/com/google/gerrit/extensions/api/projects/DeleteTagsInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DescriptionInput.java b/java/com/google/gerrit/extensions/api/projects/DescriptionInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DescriptionInput.java rename to java/com/google/gerrit/extensions/api/projects/DescriptionInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/HeadInput.java b/java/com/google/gerrit/extensions/api/projects/HeadInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/HeadInput.java rename to java/com/google/gerrit/extensions/api/projects/HeadInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ParentInput.java b/java/com/google/gerrit/extensions/api/projects/ParentInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ParentInput.java rename to java/com/google/gerrit/extensions/api/projects/ParentInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectApi.java b/java/com/google/gerrit/extensions/api/projects/ProjectApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectApi.java rename to java/com/google/gerrit/extensions/api/projects/ProjectApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectConfigEntryType.java b/java/com/google/gerrit/extensions/api/projects/ProjectConfigEntryType.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectConfigEntryType.java rename to java/com/google/gerrit/extensions/api/projects/ProjectConfigEntryType.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectInput.java b/java/com/google/gerrit/extensions/api/projects/ProjectInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectInput.java rename to java/com/google/gerrit/extensions/api/projects/ProjectInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java b/java/com/google/gerrit/extensions/api/projects/Projects.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java rename to java/com/google/gerrit/extensions/api/projects/Projects.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/RefInfo.java b/java/com/google/gerrit/extensions/api/projects/RefInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/RefInfo.java rename to java/com/google/gerrit/extensions/api/projects/RefInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ReflogEntryInfo.java b/java/com/google/gerrit/extensions/api/projects/ReflogEntryInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ReflogEntryInfo.java rename to java/com/google/gerrit/extensions/api/projects/ReflogEntryInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagApi.java b/java/com/google/gerrit/extensions/api/projects/TagApi.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagApi.java rename to java/com/google/gerrit/extensions/api/projects/TagApi.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagInfo.java b/java/com/google/gerrit/extensions/api/projects/TagInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagInfo.java rename to java/com/google/gerrit/extensions/api/projects/TagInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagInput.java b/java/com/google/gerrit/extensions/api/projects/TagInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagInput.java rename to java/com/google/gerrit/extensions/api/projects/TagInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ThemeInfo.java b/java/com/google/gerrit/extensions/api/projects/ThemeInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ThemeInfo.java rename to java/com/google/gerrit/extensions/api/projects/ThemeInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthLoginProvider.java b/java/com/google/gerrit/extensions/auth/oauth/OAuthLoginProvider.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthLoginProvider.java rename to java/com/google/gerrit/extensions/auth/oauth/OAuthLoginProvider.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthServiceProvider.java b/java/com/google/gerrit/extensions/auth/oauth/OAuthServiceProvider.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthServiceProvider.java rename to java/com/google/gerrit/extensions/auth/oauth/OAuthServiceProvider.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthToken.java b/java/com/google/gerrit/extensions/auth/oauth/OAuthToken.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthToken.java rename to java/com/google/gerrit/extensions/auth/oauth/OAuthToken.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthTokenEncrypter.java b/java/com/google/gerrit/extensions/auth/oauth/OAuthTokenEncrypter.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthTokenEncrypter.java rename to java/com/google/gerrit/extensions/auth/oauth/OAuthTokenEncrypter.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthUserInfo.java b/java/com/google/gerrit/extensions/auth/oauth/OAuthUserInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthUserInfo.java rename to java/com/google/gerrit/extensions/auth/oauth/OAuthUserInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthVerifier.java b/java/com/google/gerrit/extensions/auth/oauth/OAuthVerifier.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/auth/oauth/OAuthVerifier.java rename to java/com/google/gerrit/extensions/auth/oauth/OAuthVerifier.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/AccountFieldName.java b/java/com/google/gerrit/extensions/client/AccountFieldName.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/AccountFieldName.java rename to java/com/google/gerrit/extensions/client/AccountFieldName.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/AuthType.java b/java/com/google/gerrit/extensions/client/AuthType.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/AuthType.java rename to java/com/google/gerrit/extensions/client/AuthType.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ChangeKind.java b/java/com/google/gerrit/extensions/client/ChangeKind.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ChangeKind.java rename to java/com/google/gerrit/extensions/client/ChangeKind.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ChangeStatus.java b/java/com/google/gerrit/extensions/client/ChangeStatus.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ChangeStatus.java rename to java/com/google/gerrit/extensions/client/ChangeStatus.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Comment.java b/java/com/google/gerrit/extensions/client/Comment.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Comment.java rename to java/com/google/gerrit/extensions/client/Comment.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/DiffPreferencesInfo.java b/java/com/google/gerrit/extensions/client/DiffPreferencesInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/DiffPreferencesInfo.java rename to java/com/google/gerrit/extensions/client/DiffPreferencesInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/EditPreferencesInfo.java b/java/com/google/gerrit/extensions/client/EditPreferencesInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/EditPreferencesInfo.java rename to java/com/google/gerrit/extensions/client/EditPreferencesInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java b/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java rename to java/com/google/gerrit/extensions/client/GeneralPreferencesInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/GerritTopMenu.java b/java/com/google/gerrit/extensions/client/GerritTopMenu.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/GerritTopMenu.java rename to java/com/google/gerrit/extensions/client/GerritTopMenu.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/GitBasicAuthPolicy.java b/java/com/google/gerrit/extensions/client/GitBasicAuthPolicy.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/GitBasicAuthPolicy.java rename to java/com/google/gerrit/extensions/client/GitBasicAuthPolicy.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/InheritableBoolean.java b/java/com/google/gerrit/extensions/client/InheritableBoolean.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/InheritableBoolean.java rename to java/com/google/gerrit/extensions/client/InheritableBoolean.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/KeyMapType.java b/java/com/google/gerrit/extensions/client/KeyMapType.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/KeyMapType.java rename to java/com/google/gerrit/extensions/client/KeyMapType.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ListAccountsOption.java b/java/com/google/gerrit/extensions/client/ListAccountsOption.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ListAccountsOption.java rename to java/com/google/gerrit/extensions/client/ListAccountsOption.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ListChangesOption.java b/java/com/google/gerrit/extensions/client/ListChangesOption.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ListChangesOption.java rename to java/com/google/gerrit/extensions/client/ListChangesOption.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ListGroupsOption.java b/java/com/google/gerrit/extensions/client/ListGroupsOption.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ListGroupsOption.java rename to java/com/google/gerrit/extensions/client/ListGroupsOption.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/MenuItem.java b/java/com/google/gerrit/extensions/client/MenuItem.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/MenuItem.java rename to java/com/google/gerrit/extensions/client/MenuItem.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ProjectState.java b/java/com/google/gerrit/extensions/client/ProjectState.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ProjectState.java rename to java/com/google/gerrit/extensions/client/ProjectState.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ProjectWatchInfo.java b/java/com/google/gerrit/extensions/client/ProjectWatchInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ProjectWatchInfo.java rename to java/com/google/gerrit/extensions/client/ProjectWatchInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ReviewerState.java b/java/com/google/gerrit/extensions/client/ReviewerState.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ReviewerState.java rename to java/com/google/gerrit/extensions/client/ReviewerState.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Side.java b/java/com/google/gerrit/extensions/client/Side.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Side.java rename to java/com/google/gerrit/extensions/client/Side.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/SubmitType.java b/java/com/google/gerrit/extensions/client/SubmitType.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/SubmitType.java rename to java/com/google/gerrit/extensions/client/SubmitType.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java b/java/com/google/gerrit/extensions/client/Theme.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java rename to java/com/google/gerrit/extensions/client/Theme.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/UiType.java b/java/com/google/gerrit/extensions/client/UiType.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/UiType.java rename to java/com/google/gerrit/extensions/client/UiType.java diff --git a/java/com/google/gerrit/extensions/client/testing/BUILD b/java/com/google/gerrit/extensions/client/testing/BUILD index 3ce7e1bccf..3d09fe800d 100644 --- a/java/com/google/gerrit/extensions/client/testing/BUILD +++ b/java/com/google/gerrit/extensions/client/testing/BUILD @@ -4,7 +4,7 @@ java_library( srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/truth", "//lib:truth", ], diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AccountExternalIdInfo.java b/java/com/google/gerrit/extensions/common/AccountExternalIdInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AccountExternalIdInfo.java rename to java/com/google/gerrit/extensions/common/AccountExternalIdInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AccountInfo.java b/java/com/google/gerrit/extensions/common/AccountInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AccountInfo.java rename to java/com/google/gerrit/extensions/common/AccountInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AccountVisibility.java b/java/com/google/gerrit/extensions/common/AccountVisibility.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AccountVisibility.java rename to java/com/google/gerrit/extensions/common/AccountVisibility.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AccountsInfo.java b/java/com/google/gerrit/extensions/common/AccountsInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AccountsInfo.java rename to java/com/google/gerrit/extensions/common/AccountsInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ActionInfo.java b/java/com/google/gerrit/extensions/common/ActionInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ActionInfo.java rename to java/com/google/gerrit/extensions/common/ActionInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AgreementInfo.java b/java/com/google/gerrit/extensions/common/AgreementInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AgreementInfo.java rename to java/com/google/gerrit/extensions/common/AgreementInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AgreementInput.java b/java/com/google/gerrit/extensions/common/AgreementInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AgreementInput.java rename to java/com/google/gerrit/extensions/common/AgreementInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ApprovalInfo.java b/java/com/google/gerrit/extensions/common/ApprovalInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ApprovalInfo.java rename to java/com/google/gerrit/extensions/common/ApprovalInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AuthInfo.java b/java/com/google/gerrit/extensions/common/AuthInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AuthInfo.java rename to java/com/google/gerrit/extensions/common/AuthInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AvatarInfo.java b/java/com/google/gerrit/extensions/common/AvatarInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/AvatarInfo.java rename to java/com/google/gerrit/extensions/common/AvatarInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/BlameInfo.java b/java/com/google/gerrit/extensions/common/BlameInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/BlameInfo.java rename to java/com/google/gerrit/extensions/common/BlameInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeConfigInfo.java b/java/com/google/gerrit/extensions/common/ChangeConfigInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeConfigInfo.java rename to java/com/google/gerrit/extensions/common/ChangeConfigInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeInfo.java b/java/com/google/gerrit/extensions/common/ChangeInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeInfo.java rename to java/com/google/gerrit/extensions/common/ChangeInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeInput.java b/java/com/google/gerrit/extensions/common/ChangeInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeInput.java rename to java/com/google/gerrit/extensions/common/ChangeInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeMessageInfo.java b/java/com/google/gerrit/extensions/common/ChangeMessageInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeMessageInfo.java rename to java/com/google/gerrit/extensions/common/ChangeMessageInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeType.java b/java/com/google/gerrit/extensions/common/ChangeType.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeType.java rename to java/com/google/gerrit/extensions/common/ChangeType.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/CommentInfo.java b/java/com/google/gerrit/extensions/common/CommentInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/CommentInfo.java rename to java/com/google/gerrit/extensions/common/CommentInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/CommitInfo.java b/java/com/google/gerrit/extensions/common/CommitInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/CommitInfo.java rename to java/com/google/gerrit/extensions/common/CommitInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/CommitMessageInput.java b/java/com/google/gerrit/extensions/common/CommitMessageInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/CommitMessageInput.java rename to java/com/google/gerrit/extensions/common/CommitMessageInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DescriptionInput.java b/java/com/google/gerrit/extensions/common/DescriptionInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DescriptionInput.java rename to java/com/google/gerrit/extensions/common/DescriptionInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DiffInfo.java b/java/com/google/gerrit/extensions/common/DiffInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DiffInfo.java rename to java/com/google/gerrit/extensions/common/DiffInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DiffWebLinkInfo.java b/java/com/google/gerrit/extensions/common/DiffWebLinkInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DiffWebLinkInfo.java rename to java/com/google/gerrit/extensions/common/DiffWebLinkInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DownloadInfo.java b/java/com/google/gerrit/extensions/common/DownloadInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DownloadInfo.java rename to java/com/google/gerrit/extensions/common/DownloadInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DownloadSchemeInfo.java b/java/com/google/gerrit/extensions/common/DownloadSchemeInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/DownloadSchemeInfo.java rename to java/com/google/gerrit/extensions/common/DownloadSchemeInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/EditInfo.java b/java/com/google/gerrit/extensions/common/EditInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/EditInfo.java rename to java/com/google/gerrit/extensions/common/EditInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/EmailInfo.java b/java/com/google/gerrit/extensions/common/EmailInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/EmailInfo.java rename to java/com/google/gerrit/extensions/common/EmailInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/FetchInfo.java b/java/com/google/gerrit/extensions/common/FetchInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/FetchInfo.java rename to java/com/google/gerrit/extensions/common/FetchInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/FileInfo.java b/java/com/google/gerrit/extensions/common/FileInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/FileInfo.java rename to java/com/google/gerrit/extensions/common/FileInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/FixReplacementInfo.java b/java/com/google/gerrit/extensions/common/FixReplacementInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/FixReplacementInfo.java rename to java/com/google/gerrit/extensions/common/FixReplacementInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/FixSuggestionInfo.java b/java/com/google/gerrit/extensions/common/FixSuggestionInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/FixSuggestionInfo.java rename to java/com/google/gerrit/extensions/common/FixSuggestionInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GerritInfo.java b/java/com/google/gerrit/extensions/common/GerritInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GerritInfo.java rename to java/com/google/gerrit/extensions/common/GerritInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GitPerson.java b/java/com/google/gerrit/extensions/common/GitPerson.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GitPerson.java rename to java/com/google/gerrit/extensions/common/GitPerson.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GpgKeyInfo.java b/java/com/google/gerrit/extensions/common/GpgKeyInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GpgKeyInfo.java rename to java/com/google/gerrit/extensions/common/GpgKeyInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GroupAuditEventInfo.java b/java/com/google/gerrit/extensions/common/GroupAuditEventInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GroupAuditEventInfo.java rename to java/com/google/gerrit/extensions/common/GroupAuditEventInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GroupBaseInfo.java b/java/com/google/gerrit/extensions/common/GroupBaseInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GroupBaseInfo.java rename to java/com/google/gerrit/extensions/common/GroupBaseInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GroupInfo.java b/java/com/google/gerrit/extensions/common/GroupInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GroupInfo.java rename to java/com/google/gerrit/extensions/common/GroupInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GroupOptionsInfo.java b/java/com/google/gerrit/extensions/common/GroupOptionsInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/GroupOptionsInfo.java rename to java/com/google/gerrit/extensions/common/GroupOptionsInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/HttpPasswordInput.java b/java/com/google/gerrit/extensions/common/HttpPasswordInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/HttpPasswordInput.java rename to java/com/google/gerrit/extensions/common/HttpPasswordInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/Input.java b/java/com/google/gerrit/extensions/common/Input.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/Input.java rename to java/com/google/gerrit/extensions/common/Input.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/InstallPluginInput.java b/java/com/google/gerrit/extensions/common/InstallPluginInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/InstallPluginInput.java rename to java/com/google/gerrit/extensions/common/InstallPluginInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/LabelInfo.java b/java/com/google/gerrit/extensions/common/LabelInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/LabelInfo.java rename to java/com/google/gerrit/extensions/common/LabelInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/LabelTypeInfo.java b/java/com/google/gerrit/extensions/common/LabelTypeInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/LabelTypeInfo.java rename to java/com/google/gerrit/extensions/common/LabelTypeInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/MergeInput.java b/java/com/google/gerrit/extensions/common/MergeInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/MergeInput.java rename to java/com/google/gerrit/extensions/common/MergeInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/MergePatchSetInput.java b/java/com/google/gerrit/extensions/common/MergePatchSetInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/MergePatchSetInput.java rename to java/com/google/gerrit/extensions/common/MergePatchSetInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/MergeableInfo.java b/java/com/google/gerrit/extensions/common/MergeableInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/MergeableInfo.java rename to java/com/google/gerrit/extensions/common/MergeableInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/NameInput.java b/java/com/google/gerrit/extensions/common/NameInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/NameInput.java rename to java/com/google/gerrit/extensions/common/NameInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/PluginConfigInfo.java b/java/com/google/gerrit/extensions/common/PluginConfigInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/PluginConfigInfo.java rename to java/com/google/gerrit/extensions/common/PluginConfigInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/PluginDefinedInfo.java b/java/com/google/gerrit/extensions/common/PluginDefinedInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/PluginDefinedInfo.java rename to java/com/google/gerrit/extensions/common/PluginDefinedInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/PluginInfo.java b/java/com/google/gerrit/extensions/common/PluginInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/PluginInfo.java rename to java/com/google/gerrit/extensions/common/PluginInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ProblemInfo.java b/java/com/google/gerrit/extensions/common/ProblemInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ProblemInfo.java rename to java/com/google/gerrit/extensions/common/ProblemInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ProjectInfo.java b/java/com/google/gerrit/extensions/common/ProjectInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ProjectInfo.java rename to java/com/google/gerrit/extensions/common/ProjectInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/PureRevertInfo.java b/java/com/google/gerrit/extensions/common/PureRevertInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/PureRevertInfo.java rename to java/com/google/gerrit/extensions/common/PureRevertInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/PushCertificateInfo.java b/java/com/google/gerrit/extensions/common/PushCertificateInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/PushCertificateInfo.java rename to java/com/google/gerrit/extensions/common/PushCertificateInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RangeInfo.java b/java/com/google/gerrit/extensions/common/RangeInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RangeInfo.java rename to java/com/google/gerrit/extensions/common/RangeInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ReceiveInfo.java b/java/com/google/gerrit/extensions/common/ReceiveInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ReceiveInfo.java rename to java/com/google/gerrit/extensions/common/ReceiveInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ReviewerUpdateInfo.java b/java/com/google/gerrit/extensions/common/ReviewerUpdateInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ReviewerUpdateInfo.java rename to java/com/google/gerrit/extensions/common/ReviewerUpdateInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RevisionInfo.java b/java/com/google/gerrit/extensions/common/RevisionInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RevisionInfo.java rename to java/com/google/gerrit/extensions/common/RevisionInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RobotCommentInfo.java b/java/com/google/gerrit/extensions/common/RobotCommentInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/RobotCommentInfo.java rename to java/com/google/gerrit/extensions/common/RobotCommentInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ServerInfo.java b/java/com/google/gerrit/extensions/common/ServerInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ServerInfo.java rename to java/com/google/gerrit/extensions/common/ServerInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SetDashboardInput.java b/java/com/google/gerrit/extensions/common/SetDashboardInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SetDashboardInput.java rename to java/com/google/gerrit/extensions/common/SetDashboardInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SshKeyInfo.java b/java/com/google/gerrit/extensions/common/SshKeyInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SshKeyInfo.java rename to java/com/google/gerrit/extensions/common/SshKeyInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SshdInfo.java b/java/com/google/gerrit/extensions/common/SshdInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SshdInfo.java rename to java/com/google/gerrit/extensions/common/SshdInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SuggestInfo.java b/java/com/google/gerrit/extensions/common/SuggestInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SuggestInfo.java rename to java/com/google/gerrit/extensions/common/SuggestInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SuggestedReviewerInfo.java b/java/com/google/gerrit/extensions/common/SuggestedReviewerInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SuggestedReviewerInfo.java rename to java/com/google/gerrit/extensions/common/SuggestedReviewerInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/TestSubmitRuleInput.java b/java/com/google/gerrit/extensions/common/TestSubmitRuleInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/TestSubmitRuleInput.java rename to java/com/google/gerrit/extensions/common/TestSubmitRuleInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/TrackingIdInfo.java b/java/com/google/gerrit/extensions/common/TrackingIdInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/TrackingIdInfo.java rename to java/com/google/gerrit/extensions/common/TrackingIdInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/UserConfigInfo.java b/java/com/google/gerrit/extensions/common/UserConfigInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/UserConfigInfo.java rename to java/com/google/gerrit/extensions/common/UserConfigInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/VotingRangeInfo.java b/java/com/google/gerrit/extensions/common/VotingRangeInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/VotingRangeInfo.java rename to java/com/google/gerrit/extensions/common/VotingRangeInfo.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/WebLinkInfo.java b/java/com/google/gerrit/extensions/common/WebLinkInfo.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/WebLinkInfo.java rename to java/com/google/gerrit/extensions/common/WebLinkInfo.java diff --git a/java/com/google/gerrit/extensions/common/testing/BUILD b/java/com/google/gerrit/extensions/common/testing/BUILD index 70d9c50b17..160c14a40a 100644 --- a/java/com/google/gerrit/extensions/common/testing/BUILD +++ b/java/com/google/gerrit/extensions/common/testing/BUILD @@ -4,7 +4,7 @@ java_library( srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/extensions/client/testing:client-test-util", "//java/com/google/gerrit/truth", "//lib:truth", diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/conditions/BooleanCondition.java b/java/com/google/gerrit/extensions/conditions/BooleanCondition.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/conditions/BooleanCondition.java rename to java/com/google/gerrit/extensions/conditions/BooleanCondition.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/conditions/PrivateInternals_BooleanCondition.java b/java/com/google/gerrit/extensions/conditions/PrivateInternals_BooleanCondition.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/conditions/PrivateInternals_BooleanCondition.java rename to java/com/google/gerrit/extensions/conditions/PrivateInternals_BooleanCondition.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/CapabilityDefinition.java b/java/com/google/gerrit/extensions/config/CapabilityDefinition.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/CapabilityDefinition.java rename to java/com/google/gerrit/extensions/config/CapabilityDefinition.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/CloneCommand.java b/java/com/google/gerrit/extensions/config/CloneCommand.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/CloneCommand.java rename to java/com/google/gerrit/extensions/config/CloneCommand.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/DownloadCommand.java b/java/com/google/gerrit/extensions/config/DownloadCommand.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/DownloadCommand.java rename to java/com/google/gerrit/extensions/config/DownloadCommand.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/DownloadScheme.java b/java/com/google/gerrit/extensions/config/DownloadScheme.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/DownloadScheme.java rename to java/com/google/gerrit/extensions/config/DownloadScheme.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/ExternalIncludedIn.java b/java/com/google/gerrit/extensions/config/ExternalIncludedIn.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/ExternalIncludedIn.java rename to java/com/google/gerrit/extensions/config/ExternalIncludedIn.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/FactoryModule.java b/java/com/google/gerrit/extensions/config/FactoryModule.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/FactoryModule.java rename to java/com/google/gerrit/extensions/config/FactoryModule.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/AccountIndexedListener.java b/java/com/google/gerrit/extensions/events/AccountIndexedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/AccountIndexedListener.java rename to java/com/google/gerrit/extensions/events/AccountIndexedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/AgreementSignupListener.java b/java/com/google/gerrit/extensions/events/AgreementSignupListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/AgreementSignupListener.java rename to java/com/google/gerrit/extensions/events/AgreementSignupListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/AssigneeChangedListener.java b/java/com/google/gerrit/extensions/events/AssigneeChangedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/AssigneeChangedListener.java rename to java/com/google/gerrit/extensions/events/AssigneeChangedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeAbandonedListener.java b/java/com/google/gerrit/extensions/events/ChangeAbandonedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeAbandonedListener.java rename to java/com/google/gerrit/extensions/events/ChangeAbandonedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeEvent.java b/java/com/google/gerrit/extensions/events/ChangeEvent.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeEvent.java rename to java/com/google/gerrit/extensions/events/ChangeEvent.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeIndexedListener.java b/java/com/google/gerrit/extensions/events/ChangeIndexedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeIndexedListener.java rename to java/com/google/gerrit/extensions/events/ChangeIndexedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeMergedListener.java b/java/com/google/gerrit/extensions/events/ChangeMergedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeMergedListener.java rename to java/com/google/gerrit/extensions/events/ChangeMergedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeRestoredListener.java b/java/com/google/gerrit/extensions/events/ChangeRestoredListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeRestoredListener.java rename to java/com/google/gerrit/extensions/events/ChangeRestoredListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeRevertedListener.java b/java/com/google/gerrit/extensions/events/ChangeRevertedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ChangeRevertedListener.java rename to java/com/google/gerrit/extensions/events/ChangeRevertedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/CommentAddedListener.java b/java/com/google/gerrit/extensions/events/CommentAddedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/CommentAddedListener.java rename to java/com/google/gerrit/extensions/events/CommentAddedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/GarbageCollectorListener.java b/java/com/google/gerrit/extensions/events/GarbageCollectorListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/GarbageCollectorListener.java rename to java/com/google/gerrit/extensions/events/GarbageCollectorListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/GerritEvent.java b/java/com/google/gerrit/extensions/events/GerritEvent.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/GerritEvent.java rename to java/com/google/gerrit/extensions/events/GerritEvent.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/GitReferenceUpdatedListener.java b/java/com/google/gerrit/extensions/events/GitReferenceUpdatedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/GitReferenceUpdatedListener.java rename to java/com/google/gerrit/extensions/events/GitReferenceUpdatedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/GroupIndexedListener.java b/java/com/google/gerrit/extensions/events/GroupIndexedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/GroupIndexedListener.java rename to java/com/google/gerrit/extensions/events/GroupIndexedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/HashtagsEditedListener.java b/java/com/google/gerrit/extensions/events/HashtagsEditedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/HashtagsEditedListener.java rename to java/com/google/gerrit/extensions/events/HashtagsEditedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/HeadUpdatedListener.java b/java/com/google/gerrit/extensions/events/HeadUpdatedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/HeadUpdatedListener.java rename to java/com/google/gerrit/extensions/events/HeadUpdatedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/LifecycleListener.java b/java/com/google/gerrit/extensions/events/LifecycleListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/LifecycleListener.java rename to java/com/google/gerrit/extensions/events/LifecycleListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/NewProjectCreatedListener.java b/java/com/google/gerrit/extensions/events/NewProjectCreatedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/NewProjectCreatedListener.java rename to java/com/google/gerrit/extensions/events/NewProjectCreatedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/PluginEventListener.java b/java/com/google/gerrit/extensions/events/PluginEventListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/PluginEventListener.java rename to java/com/google/gerrit/extensions/events/PluginEventListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ProjectDeletedListener.java b/java/com/google/gerrit/extensions/events/ProjectDeletedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ProjectDeletedListener.java rename to java/com/google/gerrit/extensions/events/ProjectDeletedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ProjectEvent.java b/java/com/google/gerrit/extensions/events/ProjectEvent.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ProjectEvent.java rename to java/com/google/gerrit/extensions/events/ProjectEvent.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ProjectIndexedListener.java b/java/com/google/gerrit/extensions/events/ProjectIndexedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ProjectIndexedListener.java rename to java/com/google/gerrit/extensions/events/ProjectIndexedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ReviewerAddedListener.java b/java/com/google/gerrit/extensions/events/ReviewerAddedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ReviewerAddedListener.java rename to java/com/google/gerrit/extensions/events/ReviewerAddedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ReviewerDeletedListener.java b/java/com/google/gerrit/extensions/events/ReviewerDeletedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/ReviewerDeletedListener.java rename to java/com/google/gerrit/extensions/events/ReviewerDeletedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/RevisionCreatedListener.java b/java/com/google/gerrit/extensions/events/RevisionCreatedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/RevisionCreatedListener.java rename to java/com/google/gerrit/extensions/events/RevisionCreatedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/RevisionEvent.java b/java/com/google/gerrit/extensions/events/RevisionEvent.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/RevisionEvent.java rename to java/com/google/gerrit/extensions/events/RevisionEvent.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/TopicEditedListener.java b/java/com/google/gerrit/extensions/events/TopicEditedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/TopicEditedListener.java rename to java/com/google/gerrit/extensions/events/TopicEditedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/UsageDataPublishedListener.java b/java/com/google/gerrit/extensions/events/UsageDataPublishedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/UsageDataPublishedListener.java rename to java/com/google/gerrit/extensions/events/UsageDataPublishedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/VoteDeletedListener.java b/java/com/google/gerrit/extensions/events/VoteDeletedListener.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/events/VoteDeletedListener.java rename to java/com/google/gerrit/extensions/events/VoteDeletedListener.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/persistence/DataSourceInterceptor.java b/java/com/google/gerrit/extensions/persistence/DataSourceInterceptor.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/persistence/DataSourceInterceptor.java rename to java/com/google/gerrit/extensions/persistence/DataSourceInterceptor.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicItem.java b/java/com/google/gerrit/extensions/registration/DynamicItem.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicItem.java rename to java/com/google/gerrit/extensions/registration/DynamicItem.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicItemProvider.java b/java/com/google/gerrit/extensions/registration/DynamicItemProvider.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicItemProvider.java rename to java/com/google/gerrit/extensions/registration/DynamicItemProvider.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicMap.java b/java/com/google/gerrit/extensions/registration/DynamicMap.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicMap.java rename to java/com/google/gerrit/extensions/registration/DynamicMap.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicMapProvider.java b/java/com/google/gerrit/extensions/registration/DynamicMapProvider.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicMapProvider.java rename to java/com/google/gerrit/extensions/registration/DynamicMapProvider.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java b/java/com/google/gerrit/extensions/registration/DynamicSet.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSet.java rename to java/com/google/gerrit/extensions/registration/DynamicSet.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSetProvider.java b/java/com/google/gerrit/extensions/registration/DynamicSetProvider.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSetProvider.java rename to java/com/google/gerrit/extensions/registration/DynamicSetProvider.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java b/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java rename to java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicTypes.java b/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicTypes.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicTypes.java rename to java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicTypes.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/RegistrationHandle.java b/java/com/google/gerrit/extensions/registration/RegistrationHandle.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/RegistrationHandle.java rename to java/com/google/gerrit/extensions/registration/RegistrationHandle.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/ReloadableRegistrationHandle.java b/java/com/google/gerrit/extensions/registration/ReloadableRegistrationHandle.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/ReloadableRegistrationHandle.java rename to java/com/google/gerrit/extensions/registration/ReloadableRegistrationHandle.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/AcceptsCreate.java b/java/com/google/gerrit/extensions/restapi/AcceptsCreate.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/AcceptsCreate.java rename to java/com/google/gerrit/extensions/restapi/AcceptsCreate.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/AcceptsDelete.java b/java/com/google/gerrit/extensions/restapi/AcceptsDelete.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/AcceptsDelete.java rename to java/com/google/gerrit/extensions/restapi/AcceptsDelete.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/AcceptsPost.java b/java/com/google/gerrit/extensions/restapi/AcceptsPost.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/AcceptsPost.java rename to java/com/google/gerrit/extensions/restapi/AcceptsPost.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/AuthException.java b/java/com/google/gerrit/extensions/restapi/AuthException.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/AuthException.java rename to java/com/google/gerrit/extensions/restapi/AuthException.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/BadRequestException.java b/java/com/google/gerrit/extensions/restapi/BadRequestException.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/BadRequestException.java rename to java/com/google/gerrit/extensions/restapi/BadRequestException.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/BinaryResult.java b/java/com/google/gerrit/extensions/restapi/BinaryResult.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/BinaryResult.java rename to java/com/google/gerrit/extensions/restapi/BinaryResult.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/CacheControl.java b/java/com/google/gerrit/extensions/restapi/CacheControl.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/CacheControl.java rename to java/com/google/gerrit/extensions/restapi/CacheControl.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/ChildCollection.java b/java/com/google/gerrit/extensions/restapi/ChildCollection.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/ChildCollection.java rename to java/com/google/gerrit/extensions/restapi/ChildCollection.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/DefaultInput.java b/java/com/google/gerrit/extensions/restapi/DefaultInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/DefaultInput.java rename to java/com/google/gerrit/extensions/restapi/DefaultInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/ETagView.java b/java/com/google/gerrit/extensions/restapi/ETagView.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/ETagView.java rename to java/com/google/gerrit/extensions/restapi/ETagView.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/IdString.java b/java/com/google/gerrit/extensions/restapi/IdString.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/IdString.java rename to java/com/google/gerrit/extensions/restapi/IdString.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/MergeConflictException.java b/java/com/google/gerrit/extensions/restapi/MergeConflictException.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/MergeConflictException.java rename to java/com/google/gerrit/extensions/restapi/MergeConflictException.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/MethodNotAllowedException.java b/java/com/google/gerrit/extensions/restapi/MethodNotAllowedException.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/MethodNotAllowedException.java rename to java/com/google/gerrit/extensions/restapi/MethodNotAllowedException.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/NeedsParams.java b/java/com/google/gerrit/extensions/restapi/NeedsParams.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/NeedsParams.java rename to java/com/google/gerrit/extensions/restapi/NeedsParams.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/NotImplementedException.java b/java/com/google/gerrit/extensions/restapi/NotImplementedException.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/NotImplementedException.java rename to java/com/google/gerrit/extensions/restapi/NotImplementedException.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/PreconditionFailedException.java b/java/com/google/gerrit/extensions/restapi/PreconditionFailedException.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/PreconditionFailedException.java rename to java/com/google/gerrit/extensions/restapi/PreconditionFailedException.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RawInput.java b/java/com/google/gerrit/extensions/restapi/RawInput.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RawInput.java rename to java/com/google/gerrit/extensions/restapi/RawInput.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/ResourceConflictException.java b/java/com/google/gerrit/extensions/restapi/ResourceConflictException.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/ResourceConflictException.java rename to java/com/google/gerrit/extensions/restapi/ResourceConflictException.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/ResourceNotFoundException.java b/java/com/google/gerrit/extensions/restapi/ResourceNotFoundException.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/ResourceNotFoundException.java rename to java/com/google/gerrit/extensions/restapi/ResourceNotFoundException.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/Response.java b/java/com/google/gerrit/extensions/restapi/Response.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/Response.java rename to java/com/google/gerrit/extensions/restapi/Response.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestApiException.java b/java/com/google/gerrit/extensions/restapi/RestApiException.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestApiException.java rename to java/com/google/gerrit/extensions/restapi/RestApiException.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestApiModule.java b/java/com/google/gerrit/extensions/restapi/RestApiModule.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestApiModule.java rename to java/com/google/gerrit/extensions/restapi/RestApiModule.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestCollection.java b/java/com/google/gerrit/extensions/restapi/RestCollection.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestCollection.java rename to java/com/google/gerrit/extensions/restapi/RestCollection.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestModifyView.java b/java/com/google/gerrit/extensions/restapi/RestModifyView.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestModifyView.java rename to java/com/google/gerrit/extensions/restapi/RestModifyView.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestReadView.java b/java/com/google/gerrit/extensions/restapi/RestReadView.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestReadView.java rename to java/com/google/gerrit/extensions/restapi/RestReadView.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestResource.java b/java/com/google/gerrit/extensions/restapi/RestResource.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestResource.java rename to java/com/google/gerrit/extensions/restapi/RestResource.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestView.java b/java/com/google/gerrit/extensions/restapi/RestView.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/RestView.java rename to java/com/google/gerrit/extensions/restapi/RestView.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/TopLevelResource.java b/java/com/google/gerrit/extensions/restapi/TopLevelResource.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/TopLevelResource.java rename to java/com/google/gerrit/extensions/restapi/TopLevelResource.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/UnprocessableEntityException.java b/java/com/google/gerrit/extensions/restapi/UnprocessableEntityException.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/UnprocessableEntityException.java rename to java/com/google/gerrit/extensions/restapi/UnprocessableEntityException.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/Url.java b/java/com/google/gerrit/extensions/restapi/Url.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/restapi/Url.java rename to java/com/google/gerrit/extensions/restapi/Url.java diff --git a/java/com/google/gerrit/extensions/restapi/testing/BUILD b/java/com/google/gerrit/extensions/restapi/testing/BUILD index e836c73c60..d035816bfe 100644 --- a/java/com/google/gerrit/extensions/restapi/testing/BUILD +++ b/java/com/google/gerrit/extensions/restapi/testing/BUILD @@ -4,7 +4,7 @@ java_library( srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//gerrit-extension-api:api", + "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/truth", "//lib:truth", ], diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/systemstatus/MessageOfTheDay.java b/java/com/google/gerrit/extensions/systemstatus/MessageOfTheDay.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/systemstatus/MessageOfTheDay.java rename to java/com/google/gerrit/extensions/systemstatus/MessageOfTheDay.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/systemstatus/ServerInformation.java b/java/com/google/gerrit/extensions/systemstatus/ServerInformation.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/systemstatus/ServerInformation.java rename to java/com/google/gerrit/extensions/systemstatus/ServerInformation.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/BranchWebLink.java b/java/com/google/gerrit/extensions/webui/BranchWebLink.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/BranchWebLink.java rename to java/com/google/gerrit/extensions/webui/BranchWebLink.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/DiffWebLink.java b/java/com/google/gerrit/extensions/webui/DiffWebLink.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/DiffWebLink.java rename to java/com/google/gerrit/extensions/webui/DiffWebLink.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/FileHistoryWebLink.java b/java/com/google/gerrit/extensions/webui/FileHistoryWebLink.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/FileHistoryWebLink.java rename to java/com/google/gerrit/extensions/webui/FileHistoryWebLink.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/FileWebLink.java b/java/com/google/gerrit/extensions/webui/FileWebLink.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/FileWebLink.java rename to java/com/google/gerrit/extensions/webui/FileWebLink.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/GwtPlugin.java b/java/com/google/gerrit/extensions/webui/GwtPlugin.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/GwtPlugin.java rename to java/com/google/gerrit/extensions/webui/GwtPlugin.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/JavaScriptPlugin.java b/java/com/google/gerrit/extensions/webui/JavaScriptPlugin.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/JavaScriptPlugin.java rename to java/com/google/gerrit/extensions/webui/JavaScriptPlugin.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/ParentWebLink.java b/java/com/google/gerrit/extensions/webui/ParentWebLink.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/ParentWebLink.java rename to java/com/google/gerrit/extensions/webui/ParentWebLink.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java b/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java rename to java/com/google/gerrit/extensions/webui/PatchSetWebLink.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PrivateInternals_UiActionDescription.java b/java/com/google/gerrit/extensions/webui/PrivateInternals_UiActionDescription.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PrivateInternals_UiActionDescription.java rename to java/com/google/gerrit/extensions/webui/PrivateInternals_UiActionDescription.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/ProjectWebLink.java b/java/com/google/gerrit/extensions/webui/ProjectWebLink.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/ProjectWebLink.java rename to java/com/google/gerrit/extensions/webui/ProjectWebLink.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/TagWebLink.java b/java/com/google/gerrit/extensions/webui/TagWebLink.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/TagWebLink.java rename to java/com/google/gerrit/extensions/webui/TagWebLink.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/TopMenu.java b/java/com/google/gerrit/extensions/webui/TopMenu.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/TopMenu.java rename to java/com/google/gerrit/extensions/webui/TopMenu.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/UiAction.java b/java/com/google/gerrit/extensions/webui/UiAction.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/UiAction.java rename to java/com/google/gerrit/extensions/webui/UiAction.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/UiResult.java b/java/com/google/gerrit/extensions/webui/UiResult.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/UiResult.java rename to java/com/google/gerrit/extensions/webui/UiResult.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebLink.java b/java/com/google/gerrit/extensions/webui/WebLink.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebLink.java rename to java/com/google/gerrit/extensions/webui/WebLink.java diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebUiPlugin.java b/java/com/google/gerrit/extensions/webui/WebUiPlugin.java similarity index 100% rename from gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebUiPlugin.java rename to java/com/google/gerrit/extensions/webui/WebUiPlugin.java diff --git a/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/api/lfs/LfsDefinitionsTest.java b/javatests/com/google/gerrit/extensions/api/lfs/LfsDefinitionsTest.java similarity index 100% rename from gerrit-extension-api/src/test/java/com/google/gerrit/extensions/api/lfs/LfsDefinitionsTest.java rename to javatests/com/google/gerrit/extensions/api/lfs/LfsDefinitionsTest.java diff --git a/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/client/RangeTest.java b/javatests/com/google/gerrit/extensions/client/RangeTest.java similarity index 100% rename from gerrit-extension-api/src/test/java/com/google/gerrit/extensions/client/RangeTest.java rename to javatests/com/google/gerrit/extensions/client/RangeTest.java diff --git a/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java b/javatests/com/google/gerrit/extensions/registration/DynamicSetTest.java similarity index 100% rename from gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java rename to javatests/com/google/gerrit/extensions/registration/DynamicSetTest.java diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js index 1e3342770b..9a7a59e983 100644 --- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js +++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js @@ -428,7 +428,7 @@ return this._fetchSharedCacheURL('/accounts/self/preferences.diff'); } // These defaults should match the defaults in - // gerrit-extension-api/src/main/jcg/gerrit/extensions/client/DiffPreferencesInfo.java + // jcg/gerrit/extensions/client/DiffPreferencesInfo.java // NOTE: There are some settings that don't apply to PolyGerrit // (Render mode being at least one of them). return Promise.resolve({ diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py index db41285627..12148a12a2 100755 --- a/tools/eclipse/project.py +++ b/tools/eclipse/project.py @@ -174,6 +174,7 @@ def gen_classpath(ext): gwt_src.add(m.group(1)) classpathentry('src', 'java') + classpathentry('src', 'javatests', out='eclipse-out/test') for s in sorted(src): out = None diff --git a/tools/maven/BUILD b/tools/maven/BUILD index d46a954da5..43a85b74d3 100644 --- a/tools/maven/BUILD +++ b/tools/maven/BUILD @@ -8,19 +8,19 @@ URL = "https://oss.sonatype.org/content/repositories/snapshots" if GERRIT_VERSIO maven_package( src = { "gerrit-acceptance-framework": "//gerrit-acceptance-framework:liblib-src.jar", - "gerrit-extension-api": "//gerrit-extension-api:libapi-src.jar", + "gerrit-extension-api": "//java/com/google/gerrit/extensions:libapi-src.jar", "gerrit-plugin-api": "//gerrit-plugin-api:plugin-api-sources_deploy.jar", "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar", }, doc = { "gerrit-acceptance-framework": "//gerrit-acceptance-framework:acceptance-framework-javadoc", - "gerrit-extension-api": "//gerrit-extension-api:extension-api-javadoc", + "gerrit-extension-api": "//java/com/google/gerrit/extensions:extension-api-javadoc", "gerrit-plugin-api": "//gerrit-plugin-api:plugin-api-javadoc", "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-javadoc", }, jar = { "gerrit-acceptance-framework": "//gerrit-acceptance-framework:acceptance-framework_deploy.jar", - "gerrit-extension-api": "//gerrit-extension-api:extension-api_deploy.jar", + "gerrit-extension-api": "//java/com/google/gerrit/extensions:extension-api_deploy.jar", "gerrit-plugin-api": "//gerrit-plugin-api:plugin-api_deploy.jar", "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api_deploy.jar", },