You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/18 17:44:00 UTC

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

Author: bentmann
Date: Sat Jul 18 15:43:59 2009
New Revision: 795388

URL: http://svn.apache.org/viewvc?rev=795388&view=rev
Log:
o Exposed -provider* options as requested fo MJAR-112 (Sign using a PKCS11 token)

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

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=795388&r1=795387&r2=795388&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 Sat Jul 18 15:43:59 2009
@@ -71,7 +71,7 @@
     private File archive;
 
     /**
-     * List of arguments to append to the jarsigner command line.
+     * List of additional arguments to append to the jarsigner command line.
      *
      * @parameter expression="${jarsigner.arguments}"
      * @optional

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=795388&r1=795387&r2=795388&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 Sat Jul 18 15:43:59 2009
@@ -73,6 +73,27 @@
 
     /**
      * See <a href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
+     * 
+     * @parameter expression="${jarsigner.providerName}"
+     */
+    private String providerName;
+
+    /**
+     * See <a href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
+     * 
+     * @parameter expression="${jarsigner.providerClass}"
+     */
+    private String providerClass;
+
+    /**
+     * See <a href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
+     * 
+     * @parameter expression="${jarsigner.providerArg}"
+     */
+    private String providerArg;
+
+    /**
+     * See <a href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
      *
      * @parameter expression="${jarsigner.alias}"
      * @required
@@ -110,6 +131,21 @@
             commandLine.createArg().setValue( "-storetype" );
             commandLine.createArg().setValue( this.storetype );
         }
+        if ( !StringUtils.isEmpty( this.providerName ) )
+        {
+            commandLine.createArg().setValue( "-providerName" );
+            commandLine.createArg().setValue( this.providerName );
+        }
+        if ( !StringUtils.isEmpty( this.providerClass ) )
+        {
+            commandLine.createArg().setValue( "-providerClass" );
+            commandLine.createArg().setValue( this.providerClass );
+        }
+        if ( !StringUtils.isEmpty( this.providerArg ) )
+        {
+            commandLine.createArg().setValue( "-providerArg" );
+            commandLine.createArg().setValue( this.providerArg );
+        }
         if ( !StringUtils.isEmpty( this.sigfile ) )
         {
             commandLine.createArg().setValue( "-sigfile" );