gerrit-pgm: Align Buck rules with package boundaries

Extract http package in its own rule and include it it gerrit-war. That
means that the new artifact is going to be packaged in WEB-INF/lib
directory leaving only root pgm package artifact in pgm-lib.

Remove shell package and move one class in root pgm package. A resource
file that belongs to this functionality as well, was already in root
resource package, so it wasn't consistent anyway.

This change also extracts DEPS dependency definition with artifacts that
are shared in different rules to reuse them and not to repeat the code.

Change-Id: Ie8cbab9c1333ef34dd240619e214674f8b583d2c

gerrit-pgm/BUCK

@@ -3,22 +3,28 @@ RSRCS = 'src/main/resources/com/google/gerrit/pgm/'
 
 INIT_API_SRCS = glob([SRCS + 'init/api/*.java'])
 
-java_library(
-  name = 'init-api',
-  srcs = INIT_API_SRCS,
-  deps = [
-    '//gerrit-common:annotations',
+DEPS = [
     '//gerrit-common:server',
-    '//gerrit-reviewdb:server',
+    '//gerrit-extension-api:api',
+    '//gerrit-gwtexpui:linker_server',
+    '//gerrit-gwtexpui:server',
+    '//gerrit-httpd:httpd',
     '//gerrit-server:server',
+    '//gerrit-sshd:sshd',
+    '//gerrit-reviewdb:server',
     '//lib:guava',
     '//lib/guice:guice',
     '//lib/guice:guice-assistedinject',
+    '//lib/guice:guice-servlet',
     '//lib/jgit:jgit',
-  ],
-  provided_deps = [
     '//lib/log:api',
-  ],
+    '//lib/log:log4j',
+]
+
+java_library(
+  name = 'init-api',
+  srcs = INIT_API_SRCS,
+  deps = DEPS + ['//gerrit-common:annotations'],
   visibility = ['PUBLIC'],
 )
 
@@ -32,22 +38,15 @@ java_library(
   name = 'init',
   srcs = glob([SRCS + 'init/*.java']),
   resources = glob([RSRCS + 'init/*']),
-  deps = [
+  deps = DEPS + [
     ':init-api',
     ':util',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
     '//gerrit-lucene:lucene',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//lib:guava',
+    '//lib:args4j',
     '//lib:gwtjsonrpc',
     '//lib:gwtorm',
     '//lib:h2',
-    '//lib/guice:guice',
-    '//lib/jgit:jgit',
     '//lib/mina:sshd',
-    '//lib/log:api',
   ],
   provided_deps = ['//gerrit-launcher:launcher'],
   visibility = [
@@ -59,21 +58,12 @@ java_library(
 java_library(
   name = 'util',
   srcs = glob([SRCS + 'util/*.java']),
-  deps = [
+  deps = DEPS + [
     '//gerrit-cache-h2:cache-h2',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
     '//gerrit-util-cli:cli',
     '//lib:args4j',
-    '//lib:guava',
     '//lib:gwtorm',
     '//lib/commons:dbcp',
-    '//lib/guice:guice',
-    '//lib/jgit:jgit',
-    '//lib/log:api',
-    '//lib/log:log4j',
   ],
   visibility = [
     '//gerrit-acceptance-tests/...',
@@ -82,46 +72,37 @@ java_library(
   ],
 )
 
+java_library(
+  name = 'http',
+  srcs = glob([SRCS + 'http/**/*.java']),
+  deps = DEPS + [
+    '//lib/jetty:jmx',
+    '//lib/jetty:server',
+    '//lib/jetty:servlet',
+  ],
+  provided_deps = [
+    '//gerrit-launcher:launcher',
+    '//lib:servlet-api-3_1',
+  ],
+  visibility = ['//gerrit-war:'],
+)
+
 java_library(
   name = 'pgm',
-  srcs = glob(
-    [SRCS + n for n in [
-      '*.java',
-      # TODO(dborowitz): Split these into separate rules.
-      'http/**/*.java',
-      'shell/**/*.java',
-    ]],
-  ),
+  srcs = glob([SRCS + '*.java']),
   resources = glob([RSRCS + '*']),
-  deps = [
+  deps = DEPS + [
+    ':http',
     ':init',
     ':init-api',
     ':util',
     '//gerrit-cache-h2:cache-h2',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//gerrit-gwtexpui:linker_server',
-    '//gerrit-gwtexpui:server',
-    '//gerrit-httpd:httpd',
     '//gerrit-lucene:lucene',
     '//gerrit-openid:openid',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
     '//gerrit-solr:solr',
-    '//gerrit-sshd:sshd',
     '//lib:args4j',
-    '//lib:guava',
     '//lib:gwtorm',
     '//lib:servlet-api-3_1',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-    '//lib/guice:guice-servlet',
-    '//lib/jetty:server',
-    '//lib/jetty:servlet',
-    '//lib/jetty:jmx',
-    '//lib/jgit:jgit',
-    '//lib/log:api',
-    '//lib/log:log4j',
     '//lib/prolog:prolog-cafe',
   ],
   provided_deps = ['//gerrit-launcher:launcher'],

gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java

@@ -35,7 +35,7 @@ import com.google.gerrit.lucene.LuceneIndexModule;
 import com.google.gerrit.pgm.http.jetty.JettyEnv;
 import com.google.gerrit.pgm.http.jetty.JettyModule;
 import com.google.gerrit.pgm.http.jetty.ProjectQoSFilter;
-import com.google.gerrit.pgm.shell.JythonShell;
+import com.google.gerrit.pgm.JythonShell;
 import com.google.gerrit.pgm.util.ErrorLogFile;
 import com.google.gerrit.pgm.util.GarbageCollectionLogFile;
 import com.google.gerrit.pgm.util.LogFileCompressor;

gerrit-pgm/src/main/java/com/google/gerrit/pgm/JythonShell.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.pgm.shell;
+package com.google.gerrit.pgm;
 
 import com.google.gerrit.launcher.GerritLauncher;
 

gerrit-war/BUCK

@@ -9,6 +9,7 @@ java_library(
     '//gerrit-httpd:httpd',
     '//gerrit-lucene:lucene',
     '//gerrit-openid:openid',
+    '//gerrit-pgm:http',
     '//gerrit-pgm:init',
     '//gerrit-pgm:init-api',
     '//gerrit-pgm:util',