svn commit: r999352 - in /karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src: main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java

[gnodet]

Author: gnodet
Date: Tue Sep 21 11:58:58 2010
New Revision: 999352

URL: http://svn.apache.org/viewvc?rev=999352&view=rev
Log:
[KARAF-163] Avoid to flush the artifact type when it's a jar.

Modified:
    
karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
    
karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java

Modified: 
karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java?rev=999352&r1=999351&r2=999352&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
 (original)
+++ 
karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
 Tue Sep 21 11:58:58 2010
@@ -507,6 +507,9 @@ public class GenerateFeaturesXmlMojo ext
     }
     
     public static String toString(Artifact artifact) {
+        if (artifact.getType().equals("jar")) {
+            return String.format("%s/%s/%s", artifact.getGroupId(), 
artifact.getArtifactId(), artifact.getVersion());
+        }
         return String.format("%s/%s/%s/%s", artifact.getGroupId(), 
artifact.getArtifactId(), artifact.getVersion(), artifact.getType());
     }
 
@@ -554,8 +557,11 @@ public class GenerateFeaturesXmlMojo ext
                     out.println("    <feature version='"
                        + next.getBaseVersion() + "'>" + 
String.format("%s</feature>", next.getArtifactId()));
                 } else {
-                       out.println(String.format("    
<bundle>mvn:%s/%s/%s/%s</bundle>", 
-                            next.getGroupId(), next.getArtifactId(), 
next.getBaseVersion(), next.getType()));
+                    if (next.getType().equals("jar")) {
+                        out.println(String.format("    
<bundle>mvn:%s/%s/%s</bundle>", next.getGroupId(), next.getArtifactId(), 
next.getBaseVersion()));
+                    } else {
+                        out.println(String.format("    
<bundle>mvn:%s/%s/%s/%s</bundle>", next.getGroupId(), next.getArtifactId(), 
next.getBaseVersion(), next.getType()));
+                    }
                 }
             }
             out.println("  </feature>");

Modified: 
karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java?rev=999352&r1=999351&r2=999352&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java
 (original)
+++ 
karaf/branches/karaf-2.0.x/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java
 Tue Sep 21 11:58:58 2010
@@ -38,7 +38,7 @@ public class GenerateFeaturesXmlMojoTest
         
         replay(artifact);
         
-        assertEquals("org.apache.karaf.test/test-artifact/1.2.3/jar", 
GenerateFeaturesXmlMojo.toString(artifact));
-    }
+        assertEquals("org.apache.karaf.test/test-artifact/1.2.3", 
GenerateFeaturesXmlMojo.toString(artifact));
+    } 
 
 }