Dissolve gerrit-extension-api top-level directory

Change-Id: I47a130d3203cf45ce09f2a44e81449c55eaa693b

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",

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",

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",

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",
     ],

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",
     ],

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",
     ],

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",

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",
     ],

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",
     ],

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",

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",
     ],

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",

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",

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(