svn commit: r1195511 - 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:13:49 2011
New Revision: 1195511

URL: http://svn.apache.org/viewvc?rev=1195511&view=rev
Log:
signedjar parameter must be a file

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=1195511&r1=1195510&r2=1195511&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:13:49 2011
@@ -172,11 +172,11 @@ public class JarSignerCommandLineBuilder
             cli.createArg().setValue( sigfile );
         }
 
-        String signedjar = request.getSignedjar();
-        if (!StringUtils.isEmpty( signedjar ))
+        File signedjar = request.getSignedjar();
+        if ( signedjar != null )
         {
             cli.createArg().setValue( "-signedjar" );
-            cli.createArg().setValue( signedjar );
+            cli.createArg().setValue( signedjar.getAbsolutePath() );
         }
         cli.createArg().setFile( request.getArchive() );
 

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=1195511&r1=1195510&r2=1195511&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:13:49 2011
@@ -79,7 +79,7 @@ public class JarSignerSignRequest
     /**
      * See <a href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options">options</a>.
      */
-    protected String signedjar;
+    protected File signedjar;
 
 
     public String getKeystore()
@@ -172,12 +172,12 @@ public class JarSignerSignRequest
         this.alias = alias;
     }
 
-    public String getSignedjar()
+    public File getSignedjar()
     {
         return signedjar;
     }
 
-    public void setSignedjar( String signedjar )
+    public void setSignedjar( File 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=1195511&r1=1195510&r2=1195511&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:13:49 2011
@@ -84,7 +84,7 @@ public class SimpleJarSignTest
 
     }
 
-    protected JarSignerSignRequest buildJarSignerRequest(File target)
+    protected JarSignerSignRequest buildJarSignerRequest( File target )
     {
         JarSignerSignRequest jarSignerRequest = new JarSignerSignRequest();
         jarSignerRequest.setArchive( target );
@@ -93,7 +93,7 @@ public class SimpleJarSignTest
         jarSignerRequest.setAlias( "foo_alias" );
         jarSignerRequest.setKeypass( "key-passwd" );
         jarSignerRequest.setStorepass( "changeit" );
-        jarSignerRequest.setSignedjar( "target/ssimple.jar" );
+        jarSignerRequest.setSignedjar( new File( "target/ssimple.jar" ) );
         return jarSignerRequest;
     }
 }