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

[tchemit]

Author: tchemit
Date: Tue Dec 17 21:37:16 2013
New Revision: 1551725

URL: http://svn.apache.org/r1551725
Log:
MSHARED-305 - Use maven-shared-utils javatool API
use the simplify API (no more specialized JarSignerResult, use instead the 
simple JavaToolResult)

Removed:
    
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSignerResult.java
    
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerResult.java
Modified:
    
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
    
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.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/DefaultJarSigner.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java?rev=1551725&r1=1551724&r2=1551725&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
 (original)
+++ 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/DefaultJarSigner.java
 Tue Dec 17 21:37:16 2013
@@ -34,7 +34,7 @@ import org.codehaus.plexus.component.ann
  */
 @Component( role = JarSigner.class, hint = "default" )
 public class DefaultJarSigner
-    extends AbstractJavaTool<JarSignerRequest, JarSignerResult>
+    extends AbstractJavaTool<JarSignerRequest>
     implements JarSigner
 {
 
@@ -44,12 +44,6 @@ public class DefaultJarSigner
     }
 
     @Override
-    protected JarSignerResult createResult()
-    {
-        return new DefaultJarSignerResult();
-    }
-
-    @Override
     protected Commandline createCommandLine( JarSignerRequest request, String 
javaToolFile )
         throws JavaToolException
     {

Modified: 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.java?rev=1551725&r1=1551724&r2=1551725&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.java
 (original)
+++ 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSigner.java
 Tue Dec 17 21:37:16 2013
@@ -29,7 +29,7 @@ import org.apache.maven.shared.utils.cli
  * @since 1.0
  */
 public interface JarSigner
-    extends JavaTool<JarSignerRequest, JarSignerResult>
+    extends JavaTool<JarSignerRequest>
 {
 
 }

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=1551725&r1=1551724&r2=1551725&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
 Tue Dec 17 21:37:16 2013
@@ -18,6 +18,7 @@ package org.apache.maven.shared.jarsigne
  * under the License.
  */
 
+import org.apache.maven.shared.utils.cli.javatool.JavaToolResult;
 import org.codehaus.plexus.PlexusTestCase;
 import org.apache.maven.shared.utils.io.FileUtils;
 
@@ -47,7 +48,7 @@ public class SimpleJarSignTest
 
         JarSigner jarSigner = (JarSigner) lookup( JarSigner.class.getName() );
 
-        JarSignerResult jarSignerResult = jarSigner.execute( jarSignerRequest 
);
+        JavaToolResult jarSignerResult = jarSigner.execute( jarSignerRequest );
         assertEquals( "not exit code 0 " + 
jarSignerResult.getExecutionException(), 0, jarSignerResult.getExitCode() );
 
 
@@ -70,7 +71,7 @@ public class SimpleJarSignTest
 
         JarSigner jarSigner = (JarSigner) lookup( JarSigner.class.getName() );
 
-        JarSignerResult jarSignerResult = jarSigner.execute( jarSignerRequest 
);
+        JavaToolResult jarSignerResult = jarSigner.execute( jarSignerRequest );
 
         assertEquals( "not exit code 0 " + 
jarSignerResult.getExecutionException(), 0, jarSignerResult.getExitCode() );