svn commit: r1195495 - in /maven/shared/trunk/maven-jarsigner/src: main/java/org/apache/maven/shared/jarsigner/ test/java/org/apache/maven/shared/jarsigner/

[ol...@apache.org]

Author: olamy
Date: Mon Oct 31 15:00:28 2011
New Revision: 1195495

URL: http://svn.apache.org/viewvc?rev=1195495&view=rev
Log:
add option -signedjar

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
    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/JarSignerCommandLineBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java?rev=1195495&r1=1195494&r2=1195495&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 Mon Oct 31 15:00:28 2011
@@ -171,6 +171,12 @@ public class JarSignerCommandLineBuilder
             cli.createArg().setValue( sigfile );
         }
 
+        String signedjar = request.getSignedjar();
+        if (!StringUtils.isEmpty( signedjar ))
+        {
+            cli.createArg().setValue( "-signedjar" );
+            cli.createArg().setValue( signedjar );
+        }
         cli.createArg().setFile( request.getArchive() );
 
         String alias = request.getAlias();
@@ -178,6 +184,8 @@ public class JarSignerCommandLineBuilder
         {
             cli.createArg().setValue( alias );
         }
+
+
     }
 
     protected Commandline build( JarSignerVerifyRequest request, Commandline cli )

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=1195495&r1=1195494&r2=1195495&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 Mon Oct 31 15:00:28 2011
@@ -74,6 +74,11 @@ public class JarSignerSignRequest
      */
     private String alias;
 
+    /**
+     * See <a href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
+     */
+    protected String signedjar;
+
     public String getKeystore()
     {
         return keystore;
@@ -163,4 +168,14 @@ public class JarSignerSignRequest
     {
         this.alias = alias;
     }
+
+    public String getSignedjar()
+    {
+        return signedjar;
+    }
+
+    public void setSignedjar( String signedjar )
+    {
+        this.signedjar = signedjar;
+    }
 }

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=1195495&r1=1195494&r2=1195495&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 Mon Oct 31 15:00:28 2011
@@ -75,9 +75,12 @@ public class SimpleJarSignTest
         assertEquals( "not exit code 0 " + jarSignerResult.getExecutionException(), 0, jarSignerResult.getExitCode() );
 
         JarSignerVerifyRequest request = new JarSignerVerifyRequest();
-        request.setArchive( target );
+        request.setCerts( true );
+        request.setVerbose( true );
+        request.setArchive( new File( "target/ssimple.jar" ) );
 
-        jarSigner.execute( request );
+        jarSignerResult = jarSigner.execute( request );
+        assertEquals( "not exit code 0 " + jarSignerResult.getExecutionException(), 0, jarSignerResult.getExitCode() );
 
     }
 
@@ -90,6 +93,7 @@ public class SimpleJarSignTest
         jarSignerRequest.setAlias( "foo_alias" );
         jarSignerRequest.setKeypass( "key-passwd" );
         jarSignerRequest.setStorepass( "changeit" );
+        jarSignerRequest.setSignedjar( "target/ssimple.jar" );
         return jarSignerRequest;
     }
 }