You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by bs...@apache.org on 2008/03/07 15:23:47 UTC
svn commit: r634688 - in
/servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi:
GenerateComponentDescriptorMojo.java GenerateComponentMojo.java
Author: bsnyder
Date: Fri Mar 7 06:23:47 2008
New Revision: 634688
URL: http://svn.apache.org/viewvc?rev=634688&view=rev
Log:
SM-1267 - maven-jbi-plugin refuses to include jbi-component jars into SE packages
Modified:
servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java
servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java
Modified: servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java?rev=634688&r1=634687&r2=634688&view=diff
==============================================================================
--- servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java (original)
+++ servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java Fri Mar 7 06:23:47 2008
@@ -235,7 +235,7 @@
if ("jbi-shared-library".equals(prjType)) {
removeChildren(listener, artifact);
includes.add(artifact);
- } else if ("jar".equals(prjType) || "bundle".equals(prjType)) {
+ } else if ("jar".equals(prjType) || "bundle".equals(prjType) || "jbi-component".equals(prjType)) {
includes.add(artifact);
}
}
Modified: servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java?rev=634688&r1=634687&r2=634688&view=diff
==============================================================================
--- servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java (original)
+++ servicemix/smx3/trunk/tooling/jbi-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java Fri Mar 7 06:23:47 2008
@@ -194,7 +194,7 @@
: artifact.getType();
if ("jbi-shared-library".equals(type)) {
removeBranch(listener, artifact);
- } else if ("jar".equals(type) || "bundle".equals(type)) {
+ } else if ("jar".equals(type) || "bundle".equals(type) || "jbi-component".equals(type)) {
includes.add(artifact);
}
}