svn commit: r1541727 - in /maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner: AbstractJarsignerMojo.java JarsignerSignMojo.java JarsignerVerifyMojo.java

[tchemit]

Author: tchemit
Date: Wed Nov 13 21:22:15 2013
New Revision: 1541727

URL: http://svn.apache.org/r1541727
Log:
MJARSIGNER-28 - verify mojo can also use keystore and alias parameters

Modified:
    
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
    
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
    
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java

Modified: 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1541727&r1=1541726&r2=1541727&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
 Wed Nov 13 21:22:15 2013
@@ -63,6 +63,12 @@ public abstract class AbstractJarsignerM
     private boolean verbose;
 
     /**
+     * See <a 
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
+     */
+    @Parameter( property = "jarsigner.keystore" )
+    private String keystore;
+
+    /**
      * The maximum memory available to the JAR signer, e.g. <code>256M</code>. 
See <a
      * 
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/java.html#Xms";>-Xmx</a>
 for more details.
      */
@@ -421,6 +427,7 @@ public abstract class AbstractJarsignerM
 
         JarSignerRequest request = createRequest( archive );
         request.setArchive( archive );
+        request.setKeystore( keystore );
         request.setWorkingDirectory( workingDirectory );
         request.setMaxMemory( maxMemory );
         request.setArguments( arguments );

Modified: 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java?rev=1541727&r1=1541726&r2=1541727&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
 Wed Nov 13 21:22:15 2013
@@ -50,12 +50,6 @@ public class JarsignerSignMojo
     /**
      * See <a 
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
      */
-    @Parameter( property = "jarsigner.keystore" )
-    private String keystore;
-
-    /**
-     * See <a 
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
-     */
     @Parameter( property = "jarsigner.storepass" )
     private String storepass;
 
@@ -171,7 +165,6 @@ public class JarsignerSignMojo
     {
         JarSignerSignRequest request = new JarSignerSignRequest();
         request.setAlias( alias );
-        request.setKeystore( keystore );
         request.setProviderArg( providerArg );
         request.setProviderClass( providerClass );
         request.setProviderName( providerName );

Modified: 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java?rev=1541727&r1=1541726&r2=1541727&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
 Wed Nov 13 21:22:15 2013
@@ -46,11 +46,18 @@ public class JarsignerVerifyMojo
     private boolean certs;
 
     /**
+     * See <a 
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
+     */
+    @Parameter( property = "jarsigner.alias" )
+    private String alias;
+
+    /**
      * {@inheritDoc}
      */
     protected JarSignerRequest createRequest( File archive )
     {
         JarSignerVerifyRequest request = new JarSignerVerifyRequest();
+        request.setAlias( alias );
         request.setCerts( certs );
         return request;
     }