Dissolve gerrit-httpd top-level directory

Change-Id: I287b29b893c6f561dbbf6fa04dc714b4b7f48d54

gerrit-acceptance-framework/BUILD

@@ -12,11 +12,11 @@ PROVIDED = [
     "//java/com/google/gerrit/common:annotations",
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/extensions:api",
+    "//java/com/google/gerrit/httpd",
     "//java/com/google/gerrit/index",
     "//java/com/google/gerrit/lucene",
     "//java/com/google/gerrit/metrics",
     "//java/com/google/gerrit/reviewdb:server",
-    "//gerrit-httpd:httpd",
     "//gerrit-pgm:init",
     "//gerrit-server:receive",
     "//gerrit-server:server",

gerrit-acceptance-tests/BUILD

@@ -8,7 +8,6 @@ java_library(
     visibility = ["//visibility:public"],
     exports = [
         "//gerrit-acceptance-framework:lib",
-        "//gerrit-httpd:httpd",
         "//gerrit-launcher:launcher",
         "//gerrit-pgm:init",
         "//gerrit-pgm:pgm",
@@ -22,6 +21,7 @@ java_library(
         "//java/com/google/gerrit/extensions/common/testing:common-test-util",
         "//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util",
         "//java/com/google/gerrit/gpg/testing:gpg-test-util",
+        "//java/com/google/gerrit/httpd",
         "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/reviewdb:server",

gerrit-oauth/BUILD

@@ -10,10 +10,10 @@ java_library(
     resources = RESOURCES,
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-httpd:httpd",
         "//gerrit-server:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/httpd",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:gson",
         "//lib:guava",

gerrit-openid/BUILD

@@ -8,9 +8,9 @@ java_library(
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
-        "//java/com/google/gwtexpui/server",
-        "//gerrit-httpd:httpd",
+        "//java/com/google/gerrit/httpd",
         "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gwtexpui/server",
         "//gerrit-server:server",
         "//lib:guava",
         "//lib:gwtorm",

gerrit-pgm/BUILD

@@ -12,11 +12,11 @@ BASE_JETTY_DEPS = [
     "//java/com/google/gerrit/common:annotations",
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/extensions:api",
+    "//java/com/google/gerrit/httpd",
     "//java/com/google/gerrit/lifecycle",
     "//java/com/google/gerrit/sshd",
     "//java/com/google/gwtexpui/linker:server",
     "//java/com/google/gwtexpui/server",
-    "//gerrit-httpd:httpd",
     "//gerrit-server:server",
     "//lib:guava",
     "//lib/guice:guice",

gerrit-plugin-api/BUILD

@@ -1,7 +1,7 @@
 PLUGIN_API = [
-    "//gerrit-httpd:httpd",
     "//gerrit-pgm:init-api",
     "//gerrit-server:server",
+    "//java/com/google/gerrit/httpd",
     "//java/com/google/gerrit/sshd",
 ]
 
@@ -77,12 +77,12 @@ java_binary(
     main_class = "Dummy",
     visibility = ["//visibility:public"],
     runtime_deps = [
-        "//gerrit-httpd:libhttpd-src.jar",
         "//gerrit-pgm:libinit-api-src.jar",
         "//gerrit-server:libserver-src.jar",
         "//java/com/google/gerrit/common:libannotations-src.jar",
         "//java/com/google/gerrit/common:libserver-src.jar",
         "//java/com/google/gerrit/extensions:libapi-src.jar",
+        "//java/com/google/gerrit/httpd:libhttpd-src.jar",
         "//java/com/google/gerrit/index:libindex-src.jar",
         "//java/com/google/gerrit/index:libquery_exception-src.jar",
         "//java/com/google/gerrit/index:libquery_parser-src.jar",

gerrit-war/BUILD

@@ -5,7 +5,6 @@ java_library(
     srcs = glob(["src/main/java/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-httpd:httpd",
         "//gerrit-oauth:oauth",
         "//gerrit-openid:openid",
         "//gerrit-pgm:http",
@@ -18,6 +17,7 @@ java_library(
         "//java/com/google/gerrit/elasticsearch",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/gpg",
+        "//java/com/google/gerrit/httpd",
         "//java/com/google/gerrit/lifecycle",
         "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/metrics/dropwizard",

java/com/google/gerrit/httpd/BUILD

@@ -1,19 +1,8 @@
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-load("//tools/bzl:junit.bzl", "junit_tests")
-
-SRCS = glob(
-    ["src/main/java/**/*.java"],
-)
-
-RESOURCES = glob(["src/main/resources/**/*"])
-
 java_library(
     name = "httpd",
-    srcs = SRCS,
-    resources = RESOURCES,
+    srcs = glob(["**/*.java"]),
+    resource_strip_prefix = "resources",
+    resources = ["//resources/com/google/gerrit/httpd"],
     visibility = ["//visibility:public"],
     deps = [
         "//gerrit-launcher:launcher",
@@ -52,31 +41,3 @@ java_library(
         "//lib/lucene:lucene-core-and-backward-codecs",
     ],
 )
-
-junit_tests(
-    name = "httpd_tests",
-    srcs = glob(["src/test/java/**/*.java"]),
-    deps = [
-        ":httpd",
-        "//gerrit-server:server",
-        "//java/com/google/gerrit/common:annotations",
-        "//java/com/google/gerrit/common:server",
-        "//java/com/google/gerrit/extensions:api",
-        "//java/com/google/gerrit/reviewdb:server",
-        "//java/com/google/gerrit/util/http",
-        "//javatests/com/google/gerrit/util/http/testutil",
-        "//lib:gson",
-        "//lib:guava",
-        "//lib:gwtorm",
-        "//lib:jimfs",
-        "//lib:junit",
-        "//lib:servlet-api-3_1-without-neverlink",
-        "//lib:soy",
-        "//lib:truth",
-        "//lib/easymock",
-        "//lib/guice",
-        "//lib/guice:guice-servlet",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-        "//lib/jgit/org.eclipse.jgit.junit:junit",
-    ],
-)