Dissolve gerrit-main top-level directory

Change-Id: I9c217f640bbc94fc594280e3bd06683ea4ec978d

gerrit-main/BUILD

@@ -1,13 +0,0 @@
-java_binary(
-    name = "main_bin",
-    main_class = "Main",
-    visibility = ["//visibility:public"],
-    runtime_deps = [":main_lib"],
-)
-
-java_library(
-    name = "main_lib",
-    srcs = ["src/main/java/Main.java"],
-    visibility = ["//visibility:public"],
-    deps = ["//gerrit-launcher:launcher"],
-)

java/BUILD

@@ -0,0 +1,12 @@
+java_binary(
+    name = "gerrit-main-class",
+    main_class = "Main",
+    visibility = ["//visibility:public"],
+    runtime_deps = [":gerrit-main-class-lib"],
+)
+
+java_library(
+    name = "gerrit-main-class-lib",
+    srcs = ["Main.java"],
+    deps = ["//gerrit-launcher:launcher"],
+)

tools/bzl/pkg_war.bzl

@@ -148,7 +148,7 @@ def pkg_war(name, ui = 'ui_optdbg', context = [], doc = False, **kwargs):
     libs = LIBS + doc_lib,
     pgmlibs = PGMLIBS,
     context = doc_ctx + context + ui_deps + [
-      '//gerrit-main:main_bin_deploy.jar',
+      '//java:gerrit-main-class_deploy.jar',
       '//gerrit-war:webapp_assets',
     ],
     **kwargs

tools/eclipse/BUILD

@@ -16,7 +16,6 @@ DEPS = [
     "//gerrit-acceptance-tests:lib",
     "//gerrit-gwtdebug:gwtdebug",
     "//gerrit-gwtui:ui_module",
-    "//gerrit-main:main_lib",
     "//gerrit-plugin-gwtui:gwtui-api-lib",
     "//gerrit-server:server",
     "//lib/asciidoctor:asciidoc_lib",

tools/eclipse/gerrit_daemon.launch

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/gerrit/gerrit-main/src/main/java/Main.java"/>
+<listEntry value="/gerrit/java/Main.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>