[prev in list] [next in list] [prev in thread] [next in thread] 

List:       maven-dev
Subject:    svn commit: r1508989 - in /maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/p
From:       krosenvold () apache ! org
Date:       2013-07-31 18:55:28
Message-ID: 20130731185528.E1B6A23889DA () eris ! apache ! org
[Download RAW message or body]

Author: krosenvold
Date: Wed Jul 31 18:55:28 2013
New Revision: 1508989

URL: http://svn.apache.org/r1508989
Log:
Simplified code

Modified:
    maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
  maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
  maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java


Modified: maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
                
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/ja \
va/org/apache/maven/plugin/install/AbstractInstallMojo.java?rev=1508989&r1=1508988&r2=1508989&view=diff
 ==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java \
                (original)
+++ maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java \
Wed Jul 31 18:55:28 2013 @@ -107,12 +107,11 @@ public abstract class \
                AbstractInstallMoj
      * the original POM file (cf. MNG-2820). While the plugin currently requires \
                Maven 2.0.6, we continue to hash the
      * installed POM for robustness with regard to future changes like \
                re-introducing some kind of POM filtering.
      * 
+     *
      * @param artifact The artifact for which to create checksums, must not be \
                <code>null</code>.
-     * @param metadataFiles The set where additional metadata files will be \
                registered for later checksum installation,
-     *            must not be <code>null</code>.
      * @throws MojoExecutionException If the checksums could not be installed.
      */
-    protected void installChecksums( Artifact artifact, Collection<File> \
metadataFiles ) +    protected void installChecksums( Artifact artifact )
         throws MojoExecutionException
     {
         if ( !createChecksum )
@@ -122,6 +121,14 @@ public abstract class AbstractInstallMoj
 
         File artifactFile = getLocalRepoFile( artifact );
         installChecksums( artifactFile );
+    }
+
+    protected void addMetaDataFilesForArtifact( Artifact artifact, Collection<File> \
targetMetadataFiles ) +    {
+        if ( !createChecksum )
+        {
+            return;
+        }
 
         @SuppressWarnings( "unchecked" )
         Collection<ArtifactMetadata> metadatas = artifact.getMetadataList();
@@ -130,7 +137,7 @@ public abstract class AbstractInstallMoj
             for ( ArtifactMetadata metadata : metadatas )
             {
                 File metadataFile = getLocalRepoFile( metadata );
-                metadataFiles.add( metadataFile );
+                targetMetadataFiles.add( metadataFile );
             }
         }
     }

Modified: maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
                
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/ja \
va/org/apache/maven/plugin/install/InstallFileMojo.java?rev=1508989&r1=1508988&r2=1508989&view=diff
 ==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java \
                (original)
+++ maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java \
Wed Jul 31 18:55:28 2013 @@ -314,7 +314,9 @@ public class InstallFileMojo
         try
         {
             installer.install( file, artifact, localRepository );
-            installChecksums( artifact, metadataFiles );
+            installChecksums( artifact );
+            addMetaDataFilesForArtifact( artifact, metadataFiles );
+
         }
         catch ( ArtifactInstallationException e )
         {
@@ -336,7 +338,9 @@ public class InstallFileMojo
             try
             {
                 installer.install( sources, artifact, localRepository );
-                installChecksums( artifact, metadataFiles );
+                installChecksums( artifact );
+                addMetaDataFilesForArtifact( artifact, metadataFiles );
+
             }
             catch ( ArtifactInstallationException e )
             {
@@ -350,7 +354,9 @@ public class InstallFileMojo
             try
             {
                 installer.install( javadoc, artifact, localRepository );
-                installChecksums( artifact, metadataFiles );
+                installChecksums( artifact );
+                addMetaDataFilesForArtifact( artifact, metadataFiles );
+
             }
             catch ( ArtifactInstallationException e )
             {

Modified: maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
                
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/ja \
va/org/apache/maven/plugin/install/InstallMojo.java?rev=1508989&r1=1508988&r2=1508989&view=diff
 ==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java \
                (original)
+++ maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java \
Wed Jul 31 18:55:28 2013 @@ -154,7 +154,8 @@ public class InstallMojo
             if ( isPomArtifact )
             {
                 installer.install( pomFile, artifact, localRepository );
-                installChecksums( artifact, metadataFiles );
+                installChecksums( artifact );
+                addMetaDataFilesForArtifact( artifact, metadataFiles );
             }
             else
             {
@@ -168,7 +169,8 @@ public class InstallMojo
                 if ( file != null && file.isFile() )
                 {
                     installer.install( file, artifact, localRepository );
-                    installChecksums( artifact, metadataFiles );
+                    installChecksums( artifact );
+                    addMetaDataFilesForArtifact( artifact, metadataFiles );
                 }
                 else if ( !attachedArtifacts.isEmpty() )
                 {
@@ -184,7 +186,8 @@ public class InstallMojo
                     }
 
                     installer.install( pomFile, pomArtifact, localRepository );
-                    installChecksums( pomArtifact, metadataFiles );
+                    installChecksums( pomArtifact );
+                    addMetaDataFilesForArtifact( pomArtifact, metadataFiles );
                 }
                 else
                 {
@@ -196,7 +199,8 @@ public class InstallMojo
             for ( Artifact attached : attachedArtifacts )
             {
                 installer.install( attached.getFile(), attached, localRepository );
-                installChecksums( attached, metadataFiles );
+                installChecksums( attached );
+                addMetaDataFilesForArtifact( attached, metadataFiles );
             }
 
             installChecksums( metadataFiles );


[prev in list] [next in list] [prev in thread] [next in thread]