Dissolve gerrit-launcher top-level directory

Change-Id: I1113eec9de394c4f7fb81c6a23dbb0b3030652ff

java/BUILD

@@ -8,5 +8,5 @@ java_binary(
 java_library(
     name = "gerrit-main-class-lib",
     srcs = ["Main.java"],
-    deps = ["//gerrit-launcher:launcher"],
+    deps = ["//java/com/google/gerrit/launcher"],
 )

java/com/google/gerrit/acceptance/BUILD

@@ -8,7 +8,6 @@ java_library(
     visibility = ["//visibility:public"],
     exports = [
         ":framework-lib",
-        "//gerrit-launcher:launcher",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-server:testutil",
@@ -19,6 +18,7 @@ java_library(
         "//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/launcher",
         "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/pgm",
@@ -80,11 +80,11 @@ java_library2(
     testonly = 1,
     srcs = glob(["**/*.java"]),
     exported_deps = [
-        "//gerrit-launcher:launcher",
         "//gerrit-server:testutil",
         "//java/com/google/gerrit/gpg",
         "//java/com/google/gerrit/httpd/auth/openid",
         "//java/com/google/gerrit/index:query_exception",
+        "//java/com/google/gerrit/launcher",
         "//java/com/google/gerrit/lifecycle",
         "//java/com/google/gerrit/pgm:daemon",
         "//java/com/google/gerrit/pgm/http/jetty",

java/com/google/gerrit/httpd/BUILD

@@ -5,13 +5,13 @@ java_library(
     resources = ["//resources/com/google/gerrit/httpd"],
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-launcher:launcher",
         "//gerrit-server:receive",
         "//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/index:query_exception",
+        "//java/com/google/gerrit/launcher",
         "//java/com/google/gerrit/lifecycle",
         "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/prettify:server",

java/com/google/gerrit/launcher/BUILD

@@ -2,7 +2,7 @@
 # additional srcs or deps to this rule.
 java_library(
     name = "launcher",
-    srcs = ["src/main/java/com/google/gerrit/launcher/GerritLauncher.java"],
+    srcs = ["GerritLauncher.java"],
     resources = [":workspace-root.txt"],
     visibility = ["//visibility:public"],
 )

java/com/google/gerrit/launcher/GerritLauncher.java

@@ -604,7 +604,7 @@ public final class GerritLauncher {
     return resolveInSourceRoot("eclipse-out");
   }
 
-  static final String SOURCE_ROOT_RESOURCE = "/gerrit-launcher/workspace-root.txt";
+  static final String SOURCE_ROOT_RESOURCE = "/com/google/gerrit/launcher/workspace-root.txt";
 
   /**
    * Locate a path in the source tree.

java/com/google/gerrit/pgm/BUILD

@@ -15,7 +15,6 @@ java_library(
     resources = ["//resources/com/google/gerrit/pgm"],
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-launcher:launcher",
         "//gerrit-server:module",
         "//gerrit-server:receive",
         "//gerrit-server:server",
@@ -28,6 +27,7 @@ java_library(
         "//java/com/google/gerrit/httpd/auth/oauth",
         "//java/com/google/gerrit/httpd/auth/openid",
         "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/launcher",
         "//java/com/google/gerrit/lifecycle",
         "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/metrics/dropwizard",

java/com/google/gerrit/pgm/http/jetty/BUILD

@@ -3,11 +3,11 @@ java_library(
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-launcher:launcher",
         "//gerrit-server:server",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/httpd",
+        "//java/com/google/gerrit/launcher",
         "//java/com/google/gerrit/lifecycle",
         "//java/com/google/gerrit/sshd",
         "//java/com/google/gwtexpui/server",

java/com/google/gerrit/pgm/init/BUILD

@@ -5,13 +5,13 @@ java_library(
     resources = ["//resources/com/google/gerrit/pgm/init"],
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-launcher:launcher",
         "//gerrit-server:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/elasticsearch",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/launcher",
         "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/pgm/init/api",