From d075e12fe002c09ca01b0aee91f68a83e9ffc630 Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@users.noreply.github.com>
Date: Tue, 7 May 2019 14:25:34 +0200
Subject: [PATCH 1/4] Fix webapp resource lookup

---
 pom.xml                                                        | 1 -
 .../localization_zh_cn/LocalizationContributorImpl.java        | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cec5c39..e8765af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,6 @@
       </resource>
       <resource>
         <directory>core/src/main/webapp</directory>
-        <targetPath>webapp</targetPath>
       </resource>
       <resource>
         <directory>src/main/resources</directory>
diff --git a/src/main/java/io/jenkins/plugins/localization_zh_cn/LocalizationContributorImpl.java b/src/main/java/io/jenkins/plugins/localization_zh_cn/LocalizationContributorImpl.java
index ee31460..86cfe30 100644
--- a/src/main/java/io/jenkins/plugins/localization_zh_cn/LocalizationContributorImpl.java
+++ b/src/main/java/io/jenkins/plugins/localization_zh_cn/LocalizationContributorImpl.java
@@ -13,6 +13,9 @@ public class LocalizationContributorImpl extends LocalizationContributor {
     @CheckForNull
     @Override
     public URL getResource(@Nonnull String s) {
+        if (s.startsWith("/")) {
+            s = s.substring(1);
+        }
         return getClass().getClassLoader().getResource(s);
     }
 

From 7f447305df910518d97959f868047e16afc9f762 Mon Sep 17 00:00:00 2001
From: Zhao Xiaojie <LinuxSuRen@gmail.com>
Date: Tue, 7 May 2019 22:57:20 +0800
Subject: [PATCH 2/4] Add help files for credential domain

---
 .../src/main/webapp/help/domain/description_zh_CN.html        | 3 +++
 .../src/main/webapp/help/domain/name_zh_CN.html               | 4 ++++
 .../src/main/webapp/help/domain/specification_zh_CN.html      | 3 +++
 3 files changed, 10 insertions(+)
 create mode 100644 plugins/credentials-plugin/src/main/webapp/help/domain/description_zh_CN.html
 create mode 100644 plugins/credentials-plugin/src/main/webapp/help/domain/name_zh_CN.html
 create mode 100644 plugins/credentials-plugin/src/main/webapp/help/domain/specification_zh_CN.html

diff --git a/plugins/credentials-plugin/src/main/webapp/help/domain/description_zh_CN.html b/plugins/credentials-plugin/src/main/webapp/help/domain/description_zh_CN.html
new file mode 100644
index 0000000..fddc482
--- /dev/null
+++ b/plugins/credentials-plugin/src/main/webapp/help/domain/description_zh_CN.html
@@ -0,0 +1,3 @@
+<div>
+    对域的描述，Jenkins 自身不会用到。
+</div>
\ No newline at end of file
diff --git a/plugins/credentials-plugin/src/main/webapp/help/domain/name_zh_CN.html b/plugins/credentials-plugin/src/main/webapp/help/domain/name_zh_CN.html
new file mode 100644
index 0000000..a6623d9
--- /dev/null
+++ b/plugins/credentials-plugin/src/main/webapp/help/domain/name_zh_CN.html
@@ -0,0 +1,4 @@
+<div>
+    用于识别凭据域的简短名称。凭据的域用于对有相同元素的凭据组织在一起，例如：
+    相同的用户名或密码组合用在多个服务或者主机上。
+</div>
\ No newline at end of file
diff --git a/plugins/credentials-plugin/src/main/webapp/help/domain/specification_zh_CN.html b/plugins/credentials-plugin/src/main/webapp/help/domain/specification_zh_CN.html
new file mode 100644
index 0000000..10fcf2f
--- /dev/null
+++ b/plugins/credentials-plugin/src/main/webapp/help/domain/specification_zh_CN.html
@@ -0,0 +1,3 @@
+<div>
+    用于定义如何识别对该凭据域的请求是合法的规范列表。
+</div>
\ No newline at end of file

From 084397b21ccefc8e80e28c1d544e18d4428d6998 Mon Sep 17 00:00:00 2001
From: Zhao Xiaojie <LinuxSuRen@gmail.com>
Date: Tue, 7 May 2019 23:19:51 +0800
Subject: [PATCH 3/4] should include the webapp path

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index cec5c39..2f30a80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,10 @@
       <resource>
         <directory>plugins/credentials-plugin/src/main/resources</directory>
       </resource>
+      <resource>
+        <directory>plugins/credentials-plugin/src/main/webapp</directory>
+        <targetPath>webapp</targetPath>
+      </resource>
       <resource>
         <directory>plugins/customize-build-now-plugin/src/main/resources</directory>
       </resource>

From cc04d2c8414667f04f657ac276aa2d836c65c973 Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@users.noreply.github.com>
Date: Tue, 7 May 2019 23:22:22 +0200
Subject: [PATCH 4/4] Fix plugin resource lookup

---
 .../plugins/localization_zh_cn/LocalizationContributorImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/jenkins/plugins/localization_zh_cn/LocalizationContributorImpl.java b/src/main/java/io/jenkins/plugins/localization_zh_cn/LocalizationContributorImpl.java
index 86cfe30..2a355d1 100644
--- a/src/main/java/io/jenkins/plugins/localization_zh_cn/LocalizationContributorImpl.java
+++ b/src/main/java/io/jenkins/plugins/localization_zh_cn/LocalizationContributorImpl.java
@@ -22,6 +22,6 @@ public URL getResource(@Nonnull String s) {
     @CheckForNull
     @Override
     public URL getPluginResource(@Nonnull String s, @Nonnull PluginWrapper pluginWrapper) {
-        return getClass().getClassLoader().getResource("/webapp/" + s);
+        return getClass().getClassLoader().getResource("webapp/" + s);
     }
 }