You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2009/08/21 10:24:40 UTC
svn commit: r806449 - in
/servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi:
GenerateComponentDescriptorMojo.java GenerateComponentMojo.java
JbiComponentDescriptorWriter.java
Author: jbonofre
Date: Fri Aug 21 08:24:40 2009
New Revision: 806449
URL: http://svn.apache.org/viewvc?rev=806449&view=rev
Log:
[SM-1882] Support other dependency types in the assembly (eg EJB).
Modified:
servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java
servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java
servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
Modified: servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java
URL: http://svn.apache.org/viewvc/servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java?rev=806449&r1=806448&r2=806449&view=diff
==============================================================================
--- servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java (original)
+++ servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentDescriptorMojo.java Fri Aug 21 08:24:40 2009
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -126,6 +127,14 @@
* @parameter expression="parent-first"
*/
private String bootstrapClassLoaderDelegation;
+
+ /**
+ * A list of dependency types to include in component classpath.
+ * Default: jar, bundle, jbi-component
+ *
+ * @parameter
+ */
+ private List componentTypes = new ArrayList(Arrays.asList(new Object[]{"jar", "bundle", "jbi-component"}));
public void execute() throws MojoExecutionException, MojoFailureException {
@@ -237,7 +246,7 @@
excludeBranch(listener.getNode(artifact), excludes);
excludes.remove(artifact);
includes.add(artifact);
- } else if ("jar".equals(type) || "bundle".equals(type) || "jbi-component".equals(type)) {
+ } else if (componentTypes.contains(type)) {
includes.add(artifact);
}
}
Modified: servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java
URL: http://svn.apache.org/viewvc/servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java?rev=806449&r1=806448&r2=806449&view=diff
==============================================================================
--- servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java (original)
+++ servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/GenerateComponentMojo.java Fri Aug 21 08:24:40 2009
@@ -18,8 +18,11 @@
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import org.apache.maven.archiver.MavenArchiveConfiguration;
@@ -98,6 +101,14 @@
* @parameter
*/
private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
+
+ /**
+ * A list of dependency types to include in component classpath.
+ * Default: jar, bundle, jbi-component
+ *
+ * @parameter
+ */
+ private List componentTypes = new ArrayList(Arrays.asList(new Object[]{"jar", "bundle", "jbi-component"}));
public void execute() throws MojoExecutionException, MojoFailureException {
@@ -198,7 +209,7 @@
String type = project != null ? project.getPackaging() : artifact.getType();
if ("jbi-shared-library".equals(type)) {
excludeBranch(listener.getNode(artifact), excludes);
- } else if ("jar".equals(type) || "bundle".equals(type) || "jbi-component".equals(type)) {
+ } else if (componentTypes.contains(type)) {
includes.add(artifact);
}
}
Modified: servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java
URL: http://svn.apache.org/viewvc/servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java?rev=806449&r1=806448&r2=806449&view=diff
==============================================================================
--- servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java (original)
+++ servicemix/maven-plugins/jbi-maven-plugin/trunk/src/main/java/org/apache/servicemix/maven/plugin/jbi/JbiComponentDescriptorWriter.java Fri Aug 21 08:24:40 2009
@@ -78,11 +78,9 @@
writer.startElement("component-class-path");
for (Iterator it = uris.iterator(); it.hasNext();) {
DependencyInformation info = (DependencyInformation) it.next();
- if ("jar".equals(info.getType()) || "bundle".equals(info.getType()) || "jbi-component".equals(info.getType())) {
- writer.startElement("path-element");
- writer.writeText(info.getFilename());
- writer.endElement();
- }
+ writer.startElement("path-element");
+ writer.writeText(info.getFilename());
+ writer.endElement();
}
writer.endElement();