svn commit: r1540141 - in /maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner: JarSignerCommandLineBuilder.java JarSignerSignRequest.java

[tchemit]

Author: tchemit
Date: Fri Nov  8 18:17:49 2013
New Revision: 1540141

URL: http://svn.apache.org/r1540141
Log:
MSHARED-299 - Add support for -tsa during signing (Trusted Timestamping)

Note: Add also the -tsacert option

Modified:
    
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/JarSignerSignRequest.java

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=1540141&r1=1540140&r2=1540141&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 Nov  8 18:17:49 2013
@@ -172,6 +172,20 @@ public class JarSignerCommandLineBuilder
             cli.createArg().setValue( sigfile );
         }
 
+        String tsaLocation = request.getTsaLocation();
+        if ( StringUtils.isNotBlank( tsaLocation ) )
+        {
+            cli.createArg().setValue( "-tsa" );
+            cli.createArg().setValue( tsaLocation );
+        }
+
+        String tsaAlias = request.getTsaAlias();
+        if ( StringUtils.isNotBlank( tsaAlias ) )
+        {
+            cli.createArg().setValue( "-tsacert" );
+            cli.createArg().setValue( tsaAlias );
+        }
+
         File signedjar = request.getSignedjar();
         if ( signedjar != null )
         {

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=1540141&r1=1540140&r2=1540141&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 Nov  8 18:17:49 2013
@@ -79,6 +79,16 @@ public class JarSignerSignRequest
     /**
      * See <a 
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
      */
+    private String tsaLocation;
+
+    /**
+     * See <a 
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
+     */
+    private String tsaAlias;
+
+    /**
+     * See <a 
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
+     */
     protected File signedjar;
 
 
@@ -127,6 +137,16 @@ public class JarSignerSignRequest
         return alias;
     }
 
+    public String getTsaLocation()
+    {
+        return tsaLocation;
+    }
+
+    public String getTsaAlias()
+    {
+        return tsaAlias;
+    }
+
     public void setKeystore( String keystore )
     {
         this.keystore = keystore;
@@ -172,6 +192,16 @@ public class JarSignerSignRequest
         this.alias = alias;
     }
 
+    public void setTsaLocation( String tsaLocation )
+    {
+        this.tsaLocation = tsaLocation;
+    }
+
+    public void setTsaAlias( String tsaAlias )
+    {
+        this.tsaAlias = tsaAlias;
+    }
+
     public File getSignedjar()
     {
         return signedjar;