You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2010/09/12 11:54:58 UTC
svn commit: r996279 - in /karaf/trunk/tooling/features-maven-plugin/src: main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java

Author: jbonofre
Date: Sun Sep 12 09:54:58 2010
New Revision: 996279

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

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

Modified: karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java?rev=996279&r1=996278&r2=996279&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo.java Sun Sep 12 09:54: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/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java?rev=996279&r1=996278&r2=996279&view=diff
==============================================================================
--- karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java (original)
+++ karaf/trunk/tooling/features-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojoTest.java Sun Sep 12 09:54: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));
+    } 
 
 }