svn commit: r1541120 - in /maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner: AbstractJarSignerRequest.java JarSignerCommandLineBuilder.java JarSignerRequest.java

[tc...@apache.org]

Author: tchemit
Date: Tue Nov 12 15:59:57 2013
New Revision: 1541120

URL: http://svn.apache.org/r1541120
Log:
MSHARED-303 - Jar Signer does not support protected authentication path

Submitted by: Michael Gruebsch (see MJARSIGNER-26)

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

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=1541120&r1=1541119&r2=1541120&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 Tue Nov 12 15:59:57 2013
@@ -70,6 +70,11 @@ public abstract class AbstractJarSignerR
     private StreamConsumer systemErrorStreamConsumer;
 
     /**
+     * See <a href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
+     */
+    protected boolean protectedAuthenticationPath;
+
+    /**
      * {@inheritDoc}
      */
     public boolean isVerbose()
@@ -128,6 +133,14 @@ public abstract class AbstractJarSignerR
     /**
      * {@inheritDoc}
      */
+    public boolean isProtectedAuthenticationPath()
+    {
+      return protectedAuthenticationPath;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     public void setVerbose( boolean verbose )
     {
         this.verbose = verbose;
@@ -180,4 +193,12 @@ public abstract class AbstractJarSignerR
     {
         this.systemErrorStreamConsumer = systemErrorStreamConsumer;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setProtectedAuthenticationPath(boolean protect)
+    {
+      this.protectedAuthenticationPath = protect;
+    }
 }

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=1541120&r1=1541119&r2=1541120&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 Tue Nov 12 15:59:57 2013
@@ -65,6 +65,11 @@ public class JarSignerCommandLineBuilder
             cli.createArg().setValue( "-verbose" );
         }
 
+        if (request.isProtectedAuthenticationPath())
+        {
+            cli.createArg().setValue( "-protected" );
+        }
+
         String maxMemory = request.getMaxMemory();
         if ( StringUtils.isNotEmpty( maxMemory ) )
         {

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=1541120&r1=1541119&r2=1541120&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 Tue Nov 12 15:59:57 2013
@@ -92,6 +92,13 @@ public interface JarSignerRequest
     StreamConsumer getSystemErrorStreamConsumer();
 
     /**
+     * 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
+     */
+    boolean isProtectedAuthenticationPath();
+
+    /**
      * Sets the new given value to the field {@code verbose} of the request.
      *
      * @param verbose the new value of the field {@code verbose}.
@@ -140,5 +147,11 @@ public interface JarSignerRequest
      */
     void setSystemErrorStreamConsumer( StreamConsumer systemErrorStreamConsumer );
 
+    /**
+     * Sets the value of the command line tool parameter <pre>protected</pre>
+     * @param protectedAuthenticationPath iff the password must be given via a protected
+     * authentication path such as a dedicated PIN reader
+     */
+    void setProtectedAuthenticationPath(boolean protectedAuthenticationPath);
 
 }