Dissolve gerrit-reviewdb top-level directory

Change-Id: I76eca877d771421af1c5a6b9df37e2559d274a68

gerrit-acceptance-framework/BUILD

@@ -16,7 +16,7 @@ PROVIDED = [
     "//gerrit-index:index",
     "//gerrit-lucene:lucene",
     "//gerrit-pgm:init",
-    "//gerrit-reviewdb:server",
+    "//java/com/google/gerrit/reviewdb:server",
     "//gerrit-server:metrics",
     "//gerrit-server:receive",
     "//gerrit-server:server",

gerrit-acceptance-tests/BUILD

@@ -17,7 +17,6 @@ java_library(
         "//gerrit-pgm:init",
         "//gerrit-pgm:pgm",
         "//gerrit-pgm:util",
-        "//gerrit-reviewdb:server",
         "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
@@ -26,6 +25,7 @@ java_library(
         "//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",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:args4j",
         "//lib:gson",
         "//lib:guava-retrying",

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-reviewdb:server",
         "//gerrit-server:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:gwtorm",
         "//lib:truth",
     ],

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/BUILD

@@ -17,7 +17,7 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//gerrit-acceptance-tests:lib",
-        "//gerrit-reviewdb:server",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:gwtorm",
         "//lib:junit",
     ],

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD

@@ -29,9 +29,9 @@ java_library(
         "ProjectAssert.java",
     ],
     deps = [
-        "//gerrit-reviewdb:server",
         "//gerrit-server:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:gwtorm",
         "//lib:truth",
     ],

gerrit-common/BUILD

@@ -44,8 +44,8 @@ java_library(
     deps = [
         ":annotations",
         "//gerrit-prettify:server",
-        "//gerrit-reviewdb:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//java/org/eclipse/jgit:server",
         "//lib:guava",
         "//lib:gwtjsonrpc",

gerrit-elasticsearch/BUILD

@@ -5,9 +5,9 @@ java_library(
     deps = [
         "//gerrit-index:index",
         "//gerrit-index:query_exception",
-        "//gerrit-reviewdb:server",
         "//gerrit-server:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:gson",
         "//lib:guava",
         "//lib:gwtorm",
@@ -36,9 +36,9 @@ java_library(
     deps = [
         ":elasticsearch",
         "//gerrit-index:index",
-        "//gerrit-reviewdb:server",
         "//gerrit-server:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:gson",
         "//lib:guava",
         "//lib:junit",

gerrit-gpg/BUILD

@@ -3,7 +3,7 @@ load("//tools/bzl:junit.bzl", "junit_tests")
 DEPS = [
     "//gerrit-common:server",
     "//java/com/google/gerrit/extensions:api",
-    "//gerrit-reviewdb:server",
+    "//java/com/google/gerrit/reviewdb:server",
     "//gerrit-server:server",
     "//lib:guava",
     "//lib:gwtorm",

gerrit-httpd/BUILD

@@ -23,13 +23,13 @@ java_library(
         "//gerrit-index:query_exception",
         "//gerrit-launcher:launcher",
         "//gerrit-prettify:server",
-        "//gerrit-reviewdb:server",
         "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-util-cli:cli",
         "//gerrit-util-http:http",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:gson",
@@ -59,11 +59,11 @@ junit_tests(
         ":httpd",
         "//gerrit-common:annotations",
         "//gerrit-common:server",
-        "//gerrit-reviewdb:server",
         "//gerrit-server:server",
         "//gerrit-util-http:http",
         "//gerrit-util-http:testutil",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:gson",
         "//lib:guava",
         "//lib:gwtorm",

gerrit-lucene/BUILD

@@ -9,8 +9,8 @@ java_library(
     deps = [
         "//gerrit-index:index",
         "//gerrit-index:query_exception",
-        "//gerrit-reviewdb:server",
         "//gerrit-server:server",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:guava",
         "//lib:gwtorm",
         "//lib/lucene:lucene-core-and-backward-codecs",
@@ -30,9 +30,9 @@ java_library(
         "//gerrit-common:server",
         "//gerrit-index:index",
         "//gerrit-index:query_exception",
-        "//gerrit-reviewdb:server",
         "//gerrit-server:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:guava",
         "//lib:gwtorm",
         "//lib/guice",

gerrit-oauth/BUILD

@@ -12,9 +12,9 @@ java_library(
     deps = [
         "//gerrit-common:annotations",
         "//gerrit-httpd:httpd",
-        "//gerrit-reviewdb:server",
         "//gerrit-server:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:gson",
         "//lib:guava",
         "//lib:gwtorm",

gerrit-openid/BUILD

@@ -10,7 +10,7 @@ java_library(
         "//java/com/google/gerrit/extensions:api",
         "//gerrit-gwtexpui:server",
         "//gerrit-httpd:httpd",
-        "//gerrit-reviewdb:server",
+        "//java/com/google/gerrit/reviewdb:server",
         "//gerrit-server:server",
         "//lib:guava",
         "//lib:gwtorm",

gerrit-pgm/BUILD

@@ -27,7 +27,7 @@ BASE_JETTY_DEPS = [
 ]
 
 DEPS = BASE_JETTY_DEPS + [
-    "//gerrit-reviewdb:server",
+    "//java/com/google/gerrit/reviewdb:server",
     "//gerrit-server:metrics",
     "//gerrit-server:module",
     "//gerrit-server:receive",
@@ -104,7 +104,7 @@ java_library(
     deps = JETTY_DEPS + BASE_JETTY_DEPS + [
         # We want all these deps to be provided_deps
         "//gerrit-launcher:launcher",
-        "//gerrit-reviewdb:client",
+        "//java/com/google/gerrit/reviewdb:client",
         "//lib:servlet-api-3_1",
     ],
 )

gerrit-plugin-api/BUILD

@@ -14,7 +14,7 @@ EXPORTS = [
     "//java/com/google/gerrit/extensions:api",
     "//gerrit-gwtexpui:server",
     "//gerrit-server:metrics",
-    "//gerrit-reviewdb:server",
+    "//java/com/google/gerrit/reviewdb:server",
     "//prolog:gerrit-prolog-common",
     "//lib/commons:dbcp",
     "//lib/commons:lang",
@@ -81,10 +81,10 @@ java_binary(
         "//gerrit-index:libquery_exception-src.jar",
         "//gerrit-index:libquery_parser-src.jar",
         "//gerrit-pgm:libinit-api-src.jar",
-        "//gerrit-reviewdb:libserver-src.jar",
         "//gerrit-server:libserver-src.jar",
         "//gerrit-sshd:libsshd-src.jar",
         "//java/com/google/gerrit/extensions:libapi-src.jar",
+        "//java/com/google/gerrit/reviewdb:libserver-src.jar",
     ],
 )
 
@@ -99,7 +99,7 @@ java_doc(
         "//gerrit-common:server",
         "//java/com/google/gerrit/extensions:api",
         "//gerrit-gwtexpui:server",
-        "//gerrit-reviewdb:server",
+        "//java/com/google/gerrit/reviewdb:server",
     ],
     pkgs = ["com.google.gerrit"],
     title = "Gerrit Review Plugin API Documentation",

gerrit-plugin-gwtui/BUILD

@@ -32,7 +32,7 @@ java_library2(
         "//gerrit-gwtexpui:libUserAgent-src.jar",
         "//gerrit-gwtui-common:libclient-src.jar",
         "//gerrit-prettify:libclient-src.jar",
-        "//gerrit-reviewdb:libclient-src.jar",
+        "//java/com/google/gerrit/reviewdb:libclient-src.jar",
         "//lib/gwt:dev-neverlink",
     ],
 )
@@ -67,7 +67,7 @@ java_doc(
         "//lib/gwt:dev",
         "//gerrit-gwtui-common:client-lib",
         "//gerrit-common:client",
-        "//gerrit-reviewdb:client",
+        "//java/com/google/gerrit/reviewdb:client",
     ],
     pkgs = [
         "com.google.gerrit.plugin",

gerrit-prettify/BUILD

@@ -9,8 +9,8 @@ gwt_module(
     ]),
     exported_deps = [
         "//gerrit-gwtexpui:SafeHtml",
-        "//gerrit-reviewdb:client",
         "//java/com/google/gerrit/extensions:client",
+        "//java/com/google/gerrit/reviewdb:client",
         "//java/org/eclipse/jgit:Edit",
         "//java/org/eclipse/jgit:client",
         "//lib:gwtjsonrpc",
@@ -26,7 +26,7 @@ java_library(
     srcs = glob([SRC + "common/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-reviewdb:server",
+        "//java/com/google/gerrit/reviewdb:server",
         "//java/org/eclipse/jgit:server",
         "//lib:guava",
         "//lib:gwtjsonrpc",

gerrit-reviewdb/BUILD

@@ -1,45 +0,0 @@
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-load("//tools/bzl:gwt.bzl", "gwt_module")
-load("//tools/bzl:junit.bzl", "junit_tests")
-
-SRC = "src/main/java/com/google/gerrit/reviewdb/"
-
-TESTS = "src/test/java/com/google/gerrit/reviewdb/"
-
-gwt_module(
-    name = "client",
-    srcs = glob([SRC + "client/**/*.java"]),
-    gwt_xml = SRC + "ReviewDB.gwt.xml",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//java/com/google/gerrit/extensions:client",
-        "//lib:gwtorm_client",
-        "//lib:gwtorm_client_src",
-    ],
-)
-
-java_library(
-    name = "server",
-    srcs = glob([SRC + "**/*.java"]),
-    resources = glob(["src/main/resources/**/*"]),
-    visibility = ["//visibility:public"],
-    deps = [
-        "//java/com/google/gerrit/extensions:api",
-        "//lib:guava",
-        "//lib:gwtorm",
-    ],
-)
-
-junit_tests(
-    name = "client_tests",
-    srcs = glob([TESTS + "client/**/*.java"]),
-    deps = [
-        ":client",
-        "//gerrit-server:testutil",
-        "//lib:gwtorm",
-        "//lib:truth",
-    ],
-)

gerrit-server/BUILD

@@ -46,10 +46,10 @@ java_library(
         "//gerrit-index:query_exception",
         "//gerrit-patch-commonsnet:commons-net",
         "//gerrit-prettify:server",
-        "//gerrit-reviewdb:server",
         "//gerrit-util-cli:cli",
         "//gerrit-util-ssl:ssl",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:automaton",
@@ -125,9 +125,9 @@ java_library(
         ":server",
         "//gerrit-common:annotations",
         "//gerrit-common:server",
-        "//gerrit-reviewdb:server",
         "//gerrit-util-cli:cli",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:args4j",
         "//lib:guava",
         "//lib:gwtorm",
@@ -162,7 +162,7 @@ TESTUTIL_DEPS = [
     "//gerrit-gpg:gpg",
     "//gerrit-index:index",
     "//gerrit-lucene:lucene",
-    "//gerrit-reviewdb:server",
+    "//java/com/google/gerrit/reviewdb:server",
     "//lib:gwtorm",
     "//lib:h2",
     "//lib:truth",

gerrit-sshd/BUILD

@@ -11,12 +11,12 @@ java_library(
         "//gerrit-common:annotations",
         "//gerrit-common:server",
         "//gerrit-lucene:lucene",
-        "//gerrit-reviewdb:server",
         "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-util-cli:cli",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:gson",

gerrit-war/BUILD

@@ -16,12 +16,12 @@ java_library(
         "//gerrit-pgm:init",
         "//gerrit-pgm:init-api",
         "//gerrit-pgm:util",
-        "//gerrit-reviewdb:server",
         "//gerrit-server:module",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-sshd:sshd",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
         "//lib:guava",
         "//lib:gwtorm",
         "//lib:servlet-api-3_1",

java/com/google/gerrit/reviewdb/BUILD

@@ -0,0 +1,28 @@
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+load("//tools/bzl:gwt.bzl", "gwt_module")
+
+gwt_module(
+    name = "client",
+    srcs = glob(["client/**/*.java"]),
+    gwt_xml = "ReviewDB.gwt.xml",
+    deps = [
+        "//java/com/google/gerrit/extensions:client",
+        "//lib:gwtorm_client",
+        "//lib:gwtorm_client_src",
+    ],
+)
+
+java_library(
+    name = "server",
+    srcs = glob(["**/*.java"]),
+    resource_strip_prefix = "resources",
+    resources = ["//resources/com/google/gerrit/reviewdb"],
+    deps = [
+        "//java/com/google/gerrit/extensions:api",
+        "//lib:guava",
+        "//lib:gwtorm",
+    ],
+)

javatests/com/google/gerrit/reviewdb/BUILD

@@ -0,0 +1,12 @@
+load("//tools/bzl:junit.bzl", "junit_tests")
+
+junit_tests(
+    name = "client_tests",
+    srcs = glob(["client/**/*.java"]),
+    deps = [
+        "//gerrit-server:testutil",
+        "//java/com/google/gerrit/reviewdb:client",
+        "//lib:gwtorm",
+        "//lib:truth",
+    ],
+)

resources/com/google/gerrit/reviewdb/BUILD

@@ -0,0 +1,8 @@
+filegroup(
+    name = "reviewdb",
+    srcs = glob(
+        ["**/*"],
+        exclude = ["BUILD"],
+    ),
+    visibility = ["//visibility:public"],
+)

tools/eclipse/BUILD

@@ -12,7 +12,6 @@ TEST_DEPS = [
     "//gerrit-gwtui:ui_tests",
     "//gerrit-httpd:httpd_tests",
     "//gerrit-index:index_tests",
-    "//gerrit-reviewdb:client_tests",
     "//gerrit-server:server_tests",
 ]
 

tools/eclipse/project.py

@@ -175,6 +175,7 @@ def gen_classpath(ext):
 
   classpathentry('src', 'java')
   classpathentry('src', 'javatests', out='eclipse-out/test')
+  classpathentry('src', 'resources')
   for s in sorted(src):
     out = None