Fix plugin Change-Id: I9441e2e98630083d5157e33401cfceca917d0ee7
diff --git a/BUILD b/BUILD index 45388b3..782e3c0 100644 --- a/BUILD +++ b/BUILD
@@ -1,5 +1,4 @@ load("//tools/bzl:plugin.bzl", "gerrit_plugin") -load("//tools/bzl:genrule2.bzl", "genrule2") load("//tools/bzl:js.bzl", "polygerrit_plugin") gerrit_plugin( @@ -12,26 +11,13 @@ "Implementation-Vendor: Wikimedia Foundation", ], resources = glob(["src/main/**/*"]), - resource_jars = [":gr-zuul-status-static"], -) - -genrule2( - name = "gr-zuul-status-static", - srcs = [":gr-zuul-status"], - outs = ["gr-zuul-status-static.jar"], - cmd = " && ".join([ - "mkdir $$TMP/static", - "cp -r $(locations :gr-zuul-status) $$TMP/static", - "cd $$TMP", - "zip -Drq $$ROOT/$@ -g .", - ]), ) polygerrit_plugin( - name = "gr-zuul-status", + name = "zuul-status-ui", srcs = glob([ - "gr-zuul-status-view/*.html", - "gr-zuul-status-view/*.js", + "zuul-status/*.html", + "zuul-status/*.js", ]), - app = "plugin.html", + app = "zuul-status/zuul-status.html", )
diff --git a/gr-zuul-status-view/gr-zuul-status-view.html b/src/main/resources/static/zuul-status-view.html similarity index 98% rename from gr-zuul-status-view/gr-zuul-status-view.html rename to src/main/resources/static/zuul-status-view.html index dafdacc..e50beab 100644 --- a/gr-zuul-status-view/gr-zuul-status-view.html +++ b/src/main/resources/static/zuul-status-view.html
@@ -12,7 +12,7 @@ limitations under the License. --> -<dom-module id="gr-zuul-status-view"> +<dom-module id="zuul-status-view"> <template> <style include="shared-styles"> #view-container { @@ -230,5 +230,5 @@ </svg> </iron-iconset-svg> </template> - <script src="gr-zuul-status-view.js"></script> + <script src="zuul-status-view.js"></script> </dom-module>
diff --git a/gr-zuul-status-view/gr-zuul-status-view.js b/src/main/resources/static/zuul-status-view.js similarity index 99% rename from gr-zuul-status-view/gr-zuul-status-view.js rename to src/main/resources/static/zuul-status-view.js index 650a07d..e5df740 100644 --- a/gr-zuul-status-view/gr-zuul-status-view.js +++ b/src/main/resources/static/zuul-status-view.js
@@ -59,7 +59,7 @@ } Polymer({ - is: 'gr-zuul-status-view', + is: 'zuul-status-view', _legacyUndefinedCheck: true, properties: {
diff --git a/plugin.html b/src/main/resources/static/zuul-status.html similarity index 85% rename from plugin.html rename to src/main/resources/static/zuul-status.html index 9ad5520..e72548e 100644 --- a/plugin.html +++ b/src/main/resources/static/zuul-status.html
@@ -12,7 +12,7 @@ limitations under the License. --> -<link rel="import" href="./gr-zuul-status-view/gr-zuul-status-view.html"> +<link rel="import" href="zuul-status-view.html"> <script> (function() { @@ -23,7 +23,7 @@ Gerrit.install((plugin) => { plugin.registerCustomComponent( - 'change-view-integration', 'gr-zuul-status-view'); + 'change-view-integration', 'zuul-status-view'); }); } })();