svn commit: r949371 - in /maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg: GpgSignAttachedMojo.java GpgSigner.java

[bentmann]

Author: bentmann
Date: Sat May 29 10:20:23 2010
New Revision: 949371

URL: http://svn.apache.org/viewvc?rev=949371&view=rev
Log:
o Simplified code

Modified:
    
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
    
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java

Modified: 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java?rev=949371&r1=949370&r2=949371&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
 Sat May 29 10:20:23 2010
@@ -215,8 +215,8 @@ public class GpgSignAttachedMojo
         {
             SigningBundle bundle = (SigningBundle) i.next();
 
-            projectHelper.attachArtifact( project, bundle.getExtension() + 
".asc", bundle.getClassifier(),
-                                          bundle.getSignature() );
+            projectHelper.attachArtifact( project, bundle.getExtension() + 
GpgSigner.SIGNATURE_EXTENSION,
+                                          bundle.getClassifier(), 
bundle.getSignature() );
         }
     }
 

Modified: 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java?rev=949371&r1=949370&r2=949371&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java
 (original)
+++ 
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java
 Sat May 29 10:20:23 2010
@@ -226,12 +226,9 @@ public class GpgSigner
 
     private MavenProject findReactorProject( MavenProject prj )
     {
-        if ( prj.getParent() != null )
+        if ( prj.getParent() != null && prj.getParent().getBasedir() != null 
&& prj.getParent().getBasedir().exists() )
         {
-            if ( prj.getParent().getBasedir() != null && 
prj.getParent().getBasedir().exists() )
-            {
-                return findReactorProject( prj.getParent() );
-            }
+            return findReactorProject( prj.getParent() );
         }
         return prj;
     }