Create war artifact web.xml is restored from: Ib8f187039. Ths commit partially reverts f54665e0a0ec4025fa01d79911ff5ae4e88fc19f. Test Plan: $ bazel build gitiles $ unzip -t bazel-bin/gitiles.war Change-Id: I9778da62b06b357c718275837a3df95ca0043562
diff --git a/BUILD b/BUILD index d2e59f3..773eb61 100644 --- a/BUILD +++ b/BUILD
@@ -1 +1,13 @@ -# This file is intended to be empty +load("@com_googlesource_gerrit_bazlets//tools:pkg_war.bzl", "pkg_war") + +pkg_war( + name = "gitiles", + context = ["//gitiles-servlet:webassets"], + libs = [ + "//gitiles-servlet:servlet", + "//lib/jetty:server", + "//lib/jetty:servlet", + "//lib/slf4j:slf4j-simple", + ], + web_xml = "//gitiles-war:web_xml", +)
diff --git a/WORKSPACE b/WORKSPACE index 08f8524..9ade98c 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,8 +3,8 @@ load("//tools:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "0f87babe07a555425d829c6e7951e296e9e24579", - # local_path = "/home/<user>/projects/bazlets" + commit = "a8a04c9ef2f131816c1e458613bee93b461ba652", + # local_path = "/home/<user>/projects/bazlets", ) load(
diff --git a/gitiles-servlet/BUILD b/gitiles-servlet/BUILD index 94ddc8e..127608b 100644 --- a/gitiles-servlet/BUILD +++ b/gitiles-servlet/BUILD
@@ -1,3 +1,8 @@ +load( + "@com_googlesource_gerrit_bazlets//tools:genrule2.bzl", + "genrule2", +) + DEPS = [ "//blame-cache:lib", "//lib:autolink", @@ -38,6 +43,20 @@ ], ) +genrule2( + name = "webassets", + srcs = glob(["src/main/resources/com/google/gitiles/static/**/*"]), + outs = ["webassets.zip"], + cmd = " && ".join([ + "o=$$PWD/$@", + "tar cf - $(SRCS) | tar -C $$TMP/ --strip-components=2 -xf -", + "cd $$TMP/main/resources/com/google/gitiles/", + "mv static +static", + "zip -qr $$o .", + ]), + visibility = ["//visibility:public"], +) + java_library( name = "testutil", srcs = glob(
diff --git a/gitiles-war/BUILD b/gitiles-war/BUILD new file mode 100644 index 0000000..be3000e --- /dev/null +++ b/gitiles-war/BUILD
@@ -0,0 +1,5 @@ +filegroup( + name = "web_xml", + srcs = ["src/main/resources/web.xml"], + visibility = ["//visibility:public"], +)
diff --git a/gitiles-war/src/main/resources/web.xml b/gitiles-war/src/main/resources/web.xml new file mode 100644 index 0000000..bffacb5 --- /dev/null +++ b/gitiles-war/src/main/resources/web.xml
@@ -0,0 +1,40 @@ +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd" > +<!-- + Copyright 2012 Google Inc. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<web-app> + <display-name>Gitiles</display-name> + + <servlet> + <servlet-name>gitiles</servlet-name> + <servlet-class>com.google.gitiles.GitilesServlet</servlet-class> + <init-param> + <param-name>configPath</param-name> + <param-value>gitiles.config</param-value> + </init-param> + </servlet> + + <servlet-mapping> + <servlet-name>default</servlet-name> + <url-pattern>/+static/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>gitiles</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app>