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

[brett]

Author: brett
Date: Sun May 14 18:16:41 2006
New Revision: 406494

URL: http://svn.apache.org/viewcvs?rev=406494&view=rev
Log:
you can have both classifier and type

Modified:
    
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/AntPropertyHelper.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java?rev=406494&r1=406493&r2=406494&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java
 (original)
+++ 
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java
 Sun May 14 18:16:41 2006
@@ -65,9 +65,9 @@
         {
             Artifact artifact = (Artifact) it.next();
 
-            String key = "maven.dependency." + artifact.getGroupId() + "." + 
artifact.getArtifactId() + "." +
-                ( artifact.getClassifier() == null || 
artifact.getType().equals( artifact.getClassifier() ) ?
-                  artifact.getType() : artifact.getClassifier() ) + ".path";
+            String key = "maven.dependency." + artifact.getGroupId() + "." + 
artifact.getArtifactId() + 
+                ( artifact.getClassifier() != null ? "." + 
artifact.getClassifier() : "" ) + 
+                ( artifact.getType() != null ? "." + artifact.getType() : "" ) 
+ ".path";
 
             log.debug( "Storing: " + key + "=" + artifact.getFile().getPath() 
);