svn commit: r980967 - in /maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun: AntPropertyHelper.java AntRunMojo.java

[pg...@apache.org]

Author: pgier
Date: Fri Jul 30 21:11:47 2010
New Revision: 980967

URL: http://svn.apache.org/viewvc?rev=980967&view=rev
Log:
Minor refactoring to remove AntPropertyHelper.

Removed:
    maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java
Modified:
    maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java

Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=980967&r1=980966&r2=980967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java Fri Jul 30 21:11:47 2010
@@ -393,13 +393,35 @@ public class AntRunMojo
         {
             Artifact artifact = (Artifact) it.next();
 
-            String propName = AntPropertyHelper.getDependencyArtifactPropertyName( artifact );
+            String propName = getDependencyArtifactPropertyName( artifact );
 
             antProject.setProperty( propName, artifact.getFile().getPath() );
         }
     }
 
     /**
+     * Prefix for legacy property format.
+     * @deprecated This should only be used for generating the old property format.
+     */
+    public static final String DEPENDENCY_PREFIX = "maven.dependency.";
+    
+    /**
+     * Returns a property name for a dependency artifact.  The name is in the format
+     * maven.dependency.groupId.artifactId[.classifier].type.path
+     * 
+     * @param artifact
+     * @return property name
+     * @deprecated The dependency conflict ID should be used as the property name.
+     */
+    public static String getDependencyArtifactPropertyName( Artifact artifact )
+    {
+        String key = DEPENDENCY_PREFIX + artifact.getGroupId() + "." + artifact.getArtifactId()
+            + ( artifact.getClassifier() != null ? "." + artifact.getClassifier() : "" )
+            + ( artifact.getType() != null ? "." + artifact.getType() : "" ) + ".path";
+        return key;
+    }
+
+    /**
      * Get the current Maven project
      * 
      * @return current Maven project