svn commit: r583757 - in /incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi: GenerateComponentDescriptorMojo.java GenerateComponentMojo.java JbiComponentDescriptorWriter.java

[gnodet]

Author: gnodet
Date: Thu Oct 11 02:48:46 2007
New Revision: 583757

URL: http://svn.apache.org/viewvc?rev=583757&view=rev
Log:
SM-1102: The jbi maven plugin does not support jars packaged as bundles

Modified:
    
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java
    
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java
    
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java

Modified: 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java?rev=583757&r1=583756&r2=583757&view=diff
==============================================================================
--- 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java
 (original)
+++ 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java
 Thu Oct 11 02:48:46 2007
@@ -236,7 +236,7 @@
                 if ("jbi-shared-library".equals(prjType)) {
                     removeChildren(listener, artifact);
                     includes.add(artifact);
-                } else if ("jar".equals(prjType)) {
+                } else if ("jar".equals(prjType) || "bundle".equals(prjType)) {
                     includes.add(artifact);
                 }
             }

Modified: 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java?rev=583757&r1=583756&r2=583757&view=diff
==============================================================================
--- 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java
 (original)
+++ 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java
 Thu Oct 11 02:48:46 2007
@@ -191,7 +191,7 @@
                         : artifact.getType();
                 if ("jbi-shared-library".equals(type)) {
                     removeBranch(listener, artifact);
-                } else if ("jar".equals(type)) {
+                } else if ("jar".equals(type) || "bundle".equals(type)) {
                     includes.add(artifact);
                 }
             }

Modified: 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java?rev=583757&r1=583756&r2=583757&view=diff
==============================================================================
--- 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
 (original)
+++ 
incubator/servicemix/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
 Thu Oct 11 02:48:46 2007
@@ -78,7 +78,7 @@
         writer.startElement("component-class-path");
         for (Iterator it = uris.iterator(); it.hasNext();) {
             DependencyInformation info = (DependencyInformation) it.next();
-            if ("jar".equals(info.getType())) {
+            if ("jar".equals(info.getType()) || 
"bundle".equals(info.getType())) {
                 writer.startElement("path-element");
                 writer.writeText(info.getFilename());
                 writer.endElement();