svn commit: r999342 - 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:44:24 2010
New Revision: 999342

URL: http://svn.apache.org/viewvc?rev=999342&view=rev
Log:
[KARAF-163] Generate Features XML should handle artifact types.

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=999342&r1=999341&r2=999342&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:44:24 2010
@@ -507,7 +507,7 @@ public class GenerateFeaturesXmlMojo ext
     }
     
     public static String toString(Artifact artifact) {
-        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());
     }
 
     private class Feature {
@@ -554,8 +554,8 @@ 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</bundle>", 
-                            next.getGroupId(), next.getArtifactId(), 
next.getBaseVersion()));
+                       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=999342&r1=999341&r2=999342&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:44:24 2010
@@ -34,10 +34,11 @@ public class GenerateFeaturesXmlMojoTest
         expect(artifact.getGroupId()).andReturn("org.apache.karaf.test");
         expect(artifact.getArtifactId()).andReturn("test-artifact");
         expect(artifact.getVersion()).andReturn("1.2.3");
+        expect(artifact.getType()).andReturn("jar");
         
         replay(artifact);
         
-        assertEquals("org.apache.karaf.test/test-artifact/1.2.3", 
GenerateFeaturesXmlMojo.toString(artifact));
+        assertEquals("org.apache.karaf.test/test-artifact/1.2.3/jar", 
GenerateFeaturesXmlMojo.toString(artifact));
     }
 
 }