Skip to content
Permalink
Browse files

[JENKINS-26099] Permit StringCredentialsImpl.id and FileCredentialsIm…

…pl.id to be configured.
  • Loading branch information
jglick committed Jan 14, 2015
1 parent 846644a commit 0ba4a8ae2df3e43bafcd8fd14519c974c18a1bdf
@@ -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>
@@ -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 @@ public String getData() {
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();
@@ -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 @@
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();
@@ -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>
@@ -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>

0 comments on commit 0ba4a8a

Please sign in to comment.
You can’t perform that action at this time.