From 0ba4a8ae2df3e43bafcd8fd14519c974c18a1bdf Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 14 Jan 2015 15:02:14 -0500
Subject: [PATCH] [JENKINS-26099] Permit StringCredentialsImpl.id and
 FileCredentialsImpl.id to be configured.

---
 pom.xml                                                  | 2 +-
 .../plaincredentials/impl/FileCredentialsImpl.java       | 3 +--
 .../plaincredentials/impl/StringCredentialsImpl.java     | 3 +--
 .../impl/FileCredentialsImpl/credentials.jelly           | 9 ++-------
 .../impl/StringCredentialsImpl/credentials.jelly         | 9 ++-------
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7b81f5c..b8bcd3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials</artifactId>
-            <version>1.20</version>
+            <version>1.21-20150114.010642-1</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/src/main/java/org/jenkinsci/plugins/plaincredentials/impl/FileCredentialsImpl.java b/src/main/java/org/jenkinsci/plugins/plaincredentials/impl/FileCredentialsImpl.java
index 7248d02..c3580f2 100644
--- a/src/main/java/org/jenkinsci/plugins/plaincredentials/impl/FileCredentialsImpl.java
+++ b/src/main/java/org/jenkinsci/plugins/plaincredentials/impl/FileCredentialsImpl.java
@@ -24,7 +24,6 @@
 
 package org.jenkinsci.plugins.plaincredentials.impl;
 
-import com.cloudbees.plugins.credentials.CredentialsDescriptor;
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.impl.BaseStandardCredentials;
 import hudson.Extension;
@@ -94,7 +93,7 @@ private byte[] unencrypted() throws IOException {
         return new ByteArrayInputStream(unencrypted());
     }
 
-    @Extension public static class DescriptorImpl extends CredentialsDescriptor {
+    @Extension public static class DescriptorImpl extends BaseStandardCredentialsDescriptor {
 
         @Override public String getDisplayName() {
             return Messages.FileCredentialsImpl_secret_file();
diff --git a/src/main/java/org/jenkinsci/plugins/plaincredentials/impl/StringCredentialsImpl.java b/src/main/java/org/jenkinsci/plugins/plaincredentials/impl/StringCredentialsImpl.java
index 28d1807..e3af4f0 100644
--- a/src/main/java/org/jenkinsci/plugins/plaincredentials/impl/StringCredentialsImpl.java
+++ b/src/main/java/org/jenkinsci/plugins/plaincredentials/impl/StringCredentialsImpl.java
@@ -24,7 +24,6 @@
 
 package org.jenkinsci.plugins.plaincredentials.impl;
 
-import com.cloudbees.plugins.credentials.CredentialsDescriptor;
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.impl.BaseStandardCredentials;
 import hudson.Extension;
@@ -47,7 +46,7 @@ public final class StringCredentialsImpl extends BaseStandardCredentials impleme
         return secret;
     }
 
-    @Extension public static class DescriptorImpl extends CredentialsDescriptor {
+    @Extension public static class DescriptorImpl extends BaseStandardCredentialsDescriptor {
 
         @Override public String getDisplayName() {
             return Messages.StringCredentialsImpl_secret_text();
diff --git a/src/main/resources/org/jenkinsci/plugins/plaincredentials/impl/FileCredentialsImpl/credentials.jelly b/src/main/resources/org/jenkinsci/plugins/plaincredentials/impl/FileCredentialsImpl/credentials.jelly
index e44c61d..1fe57f8 100644
--- a/src/main/resources/org/jenkinsci/plugins/plaincredentials/impl/FileCredentialsImpl/credentials.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/plaincredentials/impl/FileCredentialsImpl/credentials.jelly
@@ -23,10 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <f:invisibleEntry>
-        <f:textbox field="id"/>
-    </f:invisibleEntry>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler">
     <j:choose>
         <j:when test="${instance == null}">
             <f:entry title="${%File}" field="file">
@@ -47,7 +44,5 @@ THE SOFTWARE.
             </f:optionalBlock>
         </j:otherwise>
     </j:choose>
-    <f:entry title="${%Description}" field="description">
-        <f:textbox/>
-    </f:entry>
+    <st:include page="id-and-description" class="${descriptor.clazz}"/>
 </j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/plaincredentials/impl/StringCredentialsImpl/credentials.jelly b/src/main/resources/org/jenkinsci/plugins/plaincredentials/impl/StringCredentialsImpl/credentials.jelly
index d9c149f..97b98da 100644
--- a/src/main/resources/org/jenkinsci/plugins/plaincredentials/impl/StringCredentialsImpl/credentials.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/plaincredentials/impl/StringCredentialsImpl/credentials.jelly
@@ -23,14 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <f:invisibleEntry>
-        <f:textbox field="id"/>
-    </f:invisibleEntry>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler">
     <f:entry title="${%Secret}" field="secret">
         <f:password/>
     </f:entry>
-    <f:entry title="${%Description}" field="description">
-        <f:textbox/>
-    </f:entry>
+    <st:include page="id-and-description" class="${descriptor.clazz}"/>
 </j:jelly>