Merge "Adapt to new StorageException class name and package"
diff --git a/BUILD b/BUILD
index d42d099..bfbc89d 100644
--- a/BUILD
+++ b/BUILD
@@ -16,20 +16,9 @@
manifest_entries = [
"Gerrit-PluginName: checks",
"Gerrit-Module: com.google.gerrit.plugins.checks.Module",
- "Gerrit-HttpModule: com.google.gerrit.plugins.checks.api.HttpModule",
+ "Gerrit-HttpModule: com.google.gerrit.plugins.checks.HttpModule",
],
- resources = glob(["src/main/resources/**/*"]),
- deps = [":checks-deps-neverlink"],
-)
-
-java_library(
- name = "checks-deps-neverlink",
- neverlink = True,
- visibility = ["//visibility:private"],
- exports = [
- "//java/com/google/gerrit/server/api",
- "//lib/antlr:java-runtime",
- "//lib/auto:auto-value",
- "//lib/auto:auto-value-annotations",
- ],
+ resource_jars = ["//plugins/checks/gr-checks:gr-checks-static"],
+ resource_strip_prefix = "plugins/checks/resources",
+ resources = glob(["resources/**/*"]),
)
diff --git a/gr-checks/BUILD b/gr-checks/BUILD
index 39ab4b3..ca089ef 100644
--- a/gr-checks/BUILD
+++ b/gr-checks/BUILD
@@ -6,6 +6,7 @@
package(default_visibility = [":visibility"])
load("//tools/bzl:js.bzl", "polygerrit_plugin")
+load("//tools/bzl:genrule2.bzl", "genrule2")
polygerrit_plugin(
name = "gr-checks",
@@ -17,3 +18,15 @@
externs = ["externs.js"],
plugin_name = "checks-pg",
)
+
+genrule2(
+ name = "gr-checks-static",
+ srcs = [":gr-checks"],
+ outs = ["gr-checks-static.jar"],
+ cmd = " && ".join([
+ "mkdir $$TMP/static",
+ "cp -r $(locations :gr-checks) $$TMP/static",
+ "cd $$TMP",
+ "zip -Drq $$ROOT/$@ -g .",
+ ]),
+)
diff --git a/java/com/google/gerrit/plugins/checks/api/HttpModule.java b/java/com/google/gerrit/plugins/checks/HttpModule.java
similarity index 77%
rename from java/com/google/gerrit/plugins/checks/api/HttpModule.java
rename to java/com/google/gerrit/plugins/checks/HttpModule.java
index 3c34503..12c0a51 100644
--- a/java/com/google/gerrit/plugins/checks/api/HttpModule.java
+++ b/java/com/google/gerrit/plugins/checks/HttpModule.java
@@ -14,6 +14,9 @@
package com.google.gerrit.plugins.checks.api;
+import com.google.gerrit.extensions.registration.DynamicSet;
+import com.google.gerrit.extensions.webui.JavaScriptPlugin;
+import com.google.gerrit.extensions.webui.WebUiPlugin;
import com.google.inject.servlet.ServletModule;
public class HttpModule extends ServletModule {
@@ -22,5 +25,7 @@
protected void configureServlets() {
serveRegex("^/checkers/(.*)$").with(CheckersRestApiServlet.class);
serveRegex("^/checks.pending/(.*)$").with(PendingChecksRestApiServlet.class);
+
+ DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new JavaScriptPlugin("checks-pg.html"));
}
}
diff --git a/src/main/resources/Documentation/about.md b/resources/Documentation/about.md
similarity index 100%
rename from src/main/resources/Documentation/about.md
rename to resources/Documentation/about.md
diff --git a/src/main/resources/Documentation/access-control.md b/resources/Documentation/access-control.md
similarity index 100%
rename from src/main/resources/Documentation/access-control.md
rename to resources/Documentation/access-control.md
diff --git a/src/main/resources/Documentation/rest-api-changes.md b/resources/Documentation/rest-api-changes.md
similarity index 100%
rename from src/main/resources/Documentation/rest-api-changes.md
rename to resources/Documentation/rest-api-changes.md
diff --git a/src/main/resources/Documentation/rest-api-checkers.md b/resources/Documentation/rest-api-checkers.md
similarity index 100%
rename from src/main/resources/Documentation/rest-api-checkers.md
rename to resources/Documentation/rest-api-checkers.md
diff --git a/src/main/resources/Documentation/rest-api-checks.md b/resources/Documentation/rest-api-checks.md
similarity index 100%
rename from src/main/resources/Documentation/rest-api-checks.md
rename to resources/Documentation/rest-api-checks.md
diff --git a/src/main/resources/Documentation/rest-api-pending-checks.md b/resources/Documentation/rest-api-pending-checks.md
similarity index 100%
rename from src/main/resources/Documentation/rest-api-pending-checks.md
rename to resources/Documentation/rest-api-pending-checks.md