Dissolve top level gitiles-* directories

The current layout of having gitiles-* directories with separate java
source trees dates back to the bad era of Maven, when this specific
layout was necessary to decompose the build into separate pom.xml files.

Moreover, src/{main,test}/java are also Maven artifacts, so that we go
even further and create three top level directories:

* java
* javatests
* resources

Change-Id: I4421096428db1e3de019a9b6c1253217cf7e4fbe

Author: davido

Diff for: BUILD

@@ -2,12 +2,12 @@ load("@com_googlesource_gerrit_bazlets//tools:pkg_war.bzl", "pkg_war")
 
 pkg_war(
     name = "gitiles",
-    context = ["//gitiles-servlet:webassets"],
+    context = ["//resources/com/google/gitiles:webassets"],
     libs = [
-        "//gitiles-servlet:servlet",
         "//lib/jetty:server",
         "//lib/jetty:servlet",
         "//lib/slf4j:slf4j-simple",
+        "//java/com/google/gitiles:servlet",
     ],
-    web_xml = "//gitiles-war:web_xml",
+    web_xml = "//resources:web_xml",
 )

Diff for: blame-cache/BUILD

@@ -0,0 +1,89 @@
+# TODO(davido): Move sources that depend on the rest of gitiles
+# out of the blame directory and move this rule into its own BUILD
+# file in blame directory.
+BLAME_CACHE_SRCS = ["blame/" + n for n in [
+    "BlameCache.java",
+    "BlameCacheImpl.java",
+    "Region.java",
+]]
+
+java_library(
+    name = "blame-cache",
+    srcs = BLAME_CACHE_SRCS,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//lib:guava",
+        "//lib/jgit",
+    ],
+)
+
+load("@com_googlesource_gerrit_bazlets//tools:javadoc.bzl", "java_doc")
+
+java_doc(
+    name = "blame-cache-javadoc",
+    libs = [
+        ":blame-cache",
+        "//lib:guava",
+        "//lib/jgit:jgit",
+    ],
+    pkgs = ["com.google.gitiles.blame"],
+    title = "Blame Cache API Documentation",
+    visibility = ["//visibility:public"],
+)
+
+DEPS = [
+    ":blame-cache",
+    "//lib:autolink",
+    "//lib:commons-lang3",
+    "//lib:gson",
+    "//lib:guava",
+    "//lib:html-types",
+    "//lib:joda-time",
+    "//lib:jsr305",
+    "//lib:commonmark",
+    "//lib:cm-autolink",
+    "//lib:gfm-tables",
+    "//lib:gfm-strikethrough",
+    "//lib:prettify",
+    "//lib/jgit:jgit",
+    "//lib/jgit:jgit-servlet",
+    "//lib/slf4j:slf4j-api",
+    "//lib/soy:soy",
+]
+
+DEPS_ALL = DEPS + [
+    "//lib/jgit:jgit-archive",
+    "//lib/guice:guice",
+]
+
+java_library(
+    name = "servlet-api",
+    neverlink = 1,
+    exports = ["//lib:servlet-api_2_5"],
+)
+
+java_library(
+    name = "servlet",
+    srcs = glob(
+        ["**/*.java"],
+        exclude = BLAME_CACHE_SRCS,
+    ),
+    resource_strip_prefix = "resources",
+    resources = ["//resources/com/google/gitiles"],
+    visibility = ["//visibility:public"],
+    deps = DEPS_ALL + [
+        ":servlet-api",
+    ],
+)
+
+load("@com_googlesource_gerrit_bazlets//tools:javadoc.bzl", "java_doc")
+
+java_doc(
+    name = "servlet-javadoc",
+    libs = DEPS + [
+        ":servlet",
+    ],
+    pkgs = ["com.google.gitiles"],
+    title = "Gitiles API Documentation",
+    visibility = ["//visibility:public"],
+)

Diff for: gitiles-servlet/BUILD

@@ -1,9 +1,9 @@
 java_library(
     name = "lib",
-    srcs = glob(["src/main/java/**/*.java"]),
+    srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gitiles-servlet:servlet",
+        "//java/com/google/gitiles:servlet",
         "//lib:guava",
         "//lib:html-types",
         "//lib:servlet-api_3_0",

Diff for: gitiles-servlet/src/main/java/com/google/gitiles/AbstractHttpFilter.java renamed to java/com/google/gitiles/AbstractHttpFilter.java

@@ -131,7 +131,7 @@ private Handler appHandler() {
             STATIC_PREFIX,
             Arrays.asList(cfg.getStringList("gitiles", null, "customTemplates")),
             sourceRoot
-                .resolve("gitiles-servlet/src/main/resources/com/google/gitiles/templates")
+                .resolve("resources/com/google/gitiles/templates")
                 .toString(),
             firstNonNull(cfg.getString("gitiles", null, "siteTitle"), "Gitiles"));
 
@@ -151,7 +151,7 @@ private Handler appHandler() {
 
   private Handler staticHandler() throws IOException {
     Path staticRoot =
-        sourceRoot.resolve("gitiles-servlet/src/main/resources/com/google/gitiles/static");
+        sourceRoot.resolve("resources/com/google/gitiles/static");
     ResourceHandler rh = new ResourceHandler();
     try {
       rh.setBaseResource(new PathResource(staticRoot.toUri().toURL()));

Diff for: gitiles-servlet/src/main/java/com/google/gitiles/ArchiveFormat.java renamed to java/com/google/gitiles/ArchiveFormat.java

@@ -0,0 +1,45 @@
+DEPS = [
+    "//lib:gson",
+    "//lib:guava",
+    "//lib/jgit:jgit",
+    "//lib/jgit:jgit-servlet",
+    "//lib:joda-time",
+    "//lib/soy:soy",
+]
+
+java_library(
+    name = "testutil",
+    srcs = glob(
+        ["**/*.java"],
+        exclude = ["**/*Test.java"],
+    ) + glob(["**/ServletTest.java"]),
+    deps = DEPS + [
+        "//java/com/google/gitiles:servlet",
+        "//lib:servlet-api_2_5",
+        "//lib:truth",
+        "//lib/jgit:junit",
+        "//lib/junit",
+    ],
+)
+
+load("@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests")
+
+junit_tests(
+    name = "servlet_tests",
+    srcs = glob(
+        [
+            "**/*Test.java",
+        ],
+        exclude = ["**/ServletTest.java"],
+    ),
+    visibility = ["//visibility:public"],
+    runtime_deps = ["//lib/junit:hamcrest-core"],
+    deps = DEPS + [
+        "//java/com/google/gitiles:servlet",
+        ":testutil",
+        "//lib:servlet-api_2_5",
+        "//lib:truth",
+        "//lib/jgit:junit",
+        "//lib/junit",
+    ],
+)

Diff for: gitiles-servlet/src/main/java/com/google/gitiles/ArchiveServlet.java renamed to java/com/google/gitiles/ArchiveServlet.java

@@ -1,5 +1,5 @@
 filegroup(
     name = "web_xml",
-    srcs = ["src/main/resources/web.xml"],
+    srcs = ["web.xml"],
     visibility = ["//visibility:public"],
 )

Diff for: java/com/google/gitiles/BUILD

@@ -0,0 +1,27 @@
+load(
+    "@com_googlesource_gerrit_bazlets//tools:genrule2.bzl",
+    "genrule2",
+)
+
+filegroup(
+    name = "gitiles",
+    srcs = glob(
+        ["**/*"],
+        exclude = ["BUILD"],
+    ),
+    visibility = ["//visibility:public"],
+)
+
+genrule2(
+    name = "webassets",
+    srcs = [":gitiles"],
+    outs = ["webassets.zip"],
+    cmd = " && ".join([
+        "o=$$PWD/$@",
+        "tar cf - $(SRCS) | tar -C $$TMP/ --strip-components=1 -xf -",
+        "cd $$TMP/com/google/gitiles/",
+        "mv static +static",
+        "zip -qr $$o .",
+    ]),
+    visibility = ["//visibility:public"],
+)

Diff for: gitiles-servlet/src/main/java/com/google/gitiles/BaseServlet.java renamed to java/com/google/gitiles/BaseServlet.java

@@ -1,7 +1,7 @@
 NAME = "com_googlesource_gerrit_bazlets"
 
 def load_bazlets(
-    commit,
+    commit = None,
     local_path = None
   ):
   if not local_path:

Diff for: gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java renamed to java/com/google/gitiles/BlobSoyData.java

@@ -2,8 +2,8 @@ load("@com_googlesource_gerrit_bazlets//tools:classpath.bzl", "classpath_collect
 load("@com_googlesource_gerrit_bazlets//tools:py_binary_path.bzl", "py_binary_path")
 
 DEPS = [
-    "//gitiles-servlet:servlet",
-    "//gitiles-dev:lib",
+    "//java/com/google/gitiles:servlet",
+    "//java/com/google/gitiles/dev:lib",
 ]
 
 java_library(
@@ -15,7 +15,7 @@ classpath_collector(
     name = "main_classpath_collect",
     testonly = 1,
     deps = DEPS + [
-        "//gitiles-servlet:servlet_tests",
+        "//javatests/com/google/gitiles:servlet_tests",
     ],
 )