You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by tc...@apache.org on 2014/03/07 23:34:04 UTC
svn commit: r1575435 - in /maven/shared/trunk/maven-jarsigner/src:
main/java/org/apache/maven/shared/jarsigner/
test/java/org/apache/maven/shared/jarsigner/
Author: tchemit
Date: Fri Mar 7 22:34:04 2014
New Revision: 1575435
URL: http://svn.apache.org/r1575435
Log:
MSHARED-316 - Can not pass storetype nor storepass to a verify request
Modified:
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
Modified: maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java?rev=1575435&r1=1575434&r2=1575435&view=diff
==============================================================================
--- maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java (original)
+++ maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/AbstractJarSignerRequest.java Fri Mar 7 22:34:04 2014
@@ -60,6 +60,21 @@ public abstract class AbstractJarSignerR
private String alias;
/**
+ * See <a href="http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
+ */
+ private String providerName;
+
+ /**
+ * See <a href="http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
+ */
+ private String providerClass;
+
+ /**
+ * See <a href="http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
+ */
+ private String providerArg;
+
+ /**
* The maximum memory available to the JAR signer, e.g. <code>256M</code>. See <a
* href="http://docs.oracle.com/javase/6/docs/technotes/tools/windows/java.html#Xms">-Xmx</a> for more details.
*/
@@ -128,6 +143,30 @@ public abstract class AbstractJarSignerR
/**
* {@inheritDoc}
*/
+ public String getProviderName()
+ {
+ return providerName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getProviderClass()
+ {
+ return providerClass;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getProviderArg()
+ {
+ return providerArg;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public String getMaxMemory()
{
return maxMemory;
@@ -200,6 +239,30 @@ public abstract class AbstractJarSignerR
/**
* {@inheritDoc}
*/
+ public void setProviderName( String providerName )
+ {
+ this.providerName = providerName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setProviderClass( String providerClass )
+ {
+ this.providerClass = providerClass;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setProviderArg( String providerArg )
+ {
+ this.providerArg = providerArg;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public void setAlias( String alias )
{
this.alias = alias;
Modified: maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java?rev=1575435&r1=1575434&r2=1575435&view=diff
==============================================================================
--- maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java (original)
+++ maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java Fri Mar 7 22:34:04 2014
@@ -73,6 +73,43 @@ public class JarSignerCommandLineBuilder
cli.createArg().setValue( keystore );
}
+ String storepass = request.getStorepass();
+ if ( !StringUtils.isEmpty( storepass ) )
+ {
+ cli.createArg().setValue( "-storepass" );
+ Arg arg = cli.createArg();
+ arg.setValue( storepass );
+ arg.setMask( true );
+ }
+
+ String storetype = request.getStoretype();
+ if ( !StringUtils.isEmpty( storetype ) )
+ {
+ cli.createArg().setValue( "-storetype" );
+ cli.createArg().setValue( storetype );
+ }
+
+ String providerName = request.getProviderName();
+ if ( !StringUtils.isEmpty( providerName ) )
+ {
+ cli.createArg().setValue( "-providerName" );
+ cli.createArg().setValue( providerName );
+ }
+
+ String providerClass = request.getProviderClass();
+ if ( !StringUtils.isEmpty( providerClass ) )
+ {
+ cli.createArg().setValue( "-providerClass" );
+ cli.createArg().setValue( providerClass );
+ }
+
+ String providerArg = request.getProviderArg();
+ if ( !StringUtils.isEmpty( providerArg ) )
+ {
+ cli.createArg().setValue( "-providerArg" );
+ cli.createArg().setValue( providerArg );
+ }
+
if ( request.isProtectedAuthenticationPath() )
{
cli.createArg().setValue( "-protected" );
@@ -137,14 +174,6 @@ public class JarSignerCommandLineBuilder
protected void build( JarSignerSignRequest request, Commandline cli )
{
- String storepass = request.getStorepass();
- if ( !StringUtils.isEmpty( storepass ) )
- {
- cli.createArg().setValue( "-storepass" );
- Arg arg = cli.createArg();
- arg.setValue( storepass );
- arg.setMask( true );
- }
String keypass = request.getKeypass();
if ( !StringUtils.isEmpty( keypass ) )
@@ -155,34 +184,6 @@ public class JarSignerCommandLineBuilder
arg.setMask( true );
}
- String storetype = request.getStoretype();
- if ( !StringUtils.isEmpty( storetype ) )
- {
- cli.createArg().setValue( "-storetype" );
- cli.createArg().setValue( storetype );
- }
-
- String providerName = request.getProviderName();
- if ( !StringUtils.isEmpty( providerName ) )
- {
- cli.createArg().setValue( "-providerName" );
- cli.createArg().setValue( providerName );
- }
-
- String providerClass = request.getProviderClass();
- if ( !StringUtils.isEmpty( providerClass ) )
- {
- cli.createArg().setValue( "-providerClass" );
- cli.createArg().setValue( providerClass );
- }
-
- String providerArg = request.getProviderArg();
- if ( !StringUtils.isEmpty( providerArg ) )
- {
- cli.createArg().setValue( "-providerArg" );
- cli.createArg().setValue( providerArg );
- }
-
String sigfile = request.getSigfile();
if ( !StringUtils.isEmpty( sigfile ) )
{
Modified: maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java?rev=1575435&r1=1575434&r2=1575435&view=diff
==============================================================================
--- maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java (original)
+++ maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerRequest.java Fri Mar 7 22:34:04 2014
@@ -63,6 +63,27 @@ public interface JarSignerRequest
String getStorepass();
/**
+ * Gets the value of the {@code providerName} field.
+ *
+ * @return the value of the {@code providerName} field.
+ */
+ String getProviderName();
+
+ /**
+ * Gets the value of the {@code providerClass} field.
+ *
+ * @return the value of the {@code providerClass} field.
+ */
+ String getProviderClass();
+
+ /**
+ * Gets the value of the {@code providerArg} field.
+ *
+ * @return the value of the {@code providerArg} field.
+ */
+ String getProviderArg();
+
+ /**
* Gets the value of the {@code alias} field.
*
* @return the value of the {@code alias} field.
@@ -103,7 +124,7 @@ public interface JarSignerRequest
* Gets the value of the command line tool parameter <pre>protected</pre>
*
* @return true iff the password must be given via a protected
- * authentication path such as a dedicated PIN reader
+ * authentication path such as a dedicated PIN reader
*/
boolean isProtectedAuthenticationPath();
@@ -143,6 +164,27 @@ public interface JarSignerRequest
void setAlias( String alias );
/**
+ * Sets the new given value to the field {@code providerName} of the request.
+ *
+ * @param providerName the new value of the field {@code providerName}.
+ */
+ void setProviderName( String providerName );
+
+ /**
+ * Sets the new given value to the field {@code providerClass} of the request.
+ *
+ * @param providerClass the new value of the field {@code providerClass}.
+ */
+ public void setProviderClass( String providerClass );
+
+ /**
+ * Sets the new given value to the field {@code providerArg} of the request.
+ *
+ * @param providerArg the new value of the field {@code providerArg}.
+ */
+ void setProviderArg( String providerArg );
+
+ /**
* Sets the new given value to the field {@code maxMemory} of the request.
*
* @param maxMemory the new value of the field {@code maxMemory}.
Modified: maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java?rev=1575435&r1=1575434&r2=1575435&view=diff
==============================================================================
--- maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java (original)
+++ maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java Fri Mar 7 22:34:04 2014
@@ -45,22 +45,6 @@ public class JarSignerSignRequest
/**
* See <a href="http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
*/
- private String providerName;
-
- /**
- * See <a href="http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
- */
- private String providerClass;
-
- /**
- * See <a href="http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
- */
- private String providerArg;
-
-
- /**
- * See <a href="http://docs.oracle.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
- */
private String tsaLocation;
/**
@@ -84,21 +68,6 @@ public class JarSignerSignRequest
return sigfile;
}
- public String getProviderName()
- {
- return providerName;
- }
-
- public String getProviderClass()
- {
- return providerClass;
- }
-
- public String getProviderArg()
- {
- return providerArg;
- }
-
public String getTsaLocation()
{
return tsaLocation;
@@ -119,21 +88,6 @@ public class JarSignerSignRequest
this.sigfile = sigfile;
}
- public void setProviderName( String providerName )
- {
- this.providerName = providerName;
- }
-
- public void setProviderClass( String providerClass )
- {
- this.providerClass = providerClass;
- }
-
- public void setProviderArg( String providerArg )
- {
- this.providerArg = providerArg;
- }
-
public void setTsaLocation( String tsaLocation )
{
this.tsaLocation = tsaLocation;
Modified: maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java?rev=1575435&r1=1575434&r2=1575435&view=diff
==============================================================================
--- maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java (original)
+++ maven/shared/trunk/maven-jarsigner/src/test/java/org/apache/maven/shared/jarsigner/SimpleJarSignTest.java Fri Mar 7 22:34:04 2014
@@ -69,6 +69,7 @@ public class SimpleJarSignTest
request.setArchive( new File( "target/ssimple.jar" ) );
request.setKeystore( "src/test/keystore" );
request.setAlias( "foo_alias" );
+ request.setStorepass( "changeit" );
JavaToolResult jarSignerResult = jarSigner.execute( request );