You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2011/04/04 20:41:33 UTC
svn commit: r1088708 [1/2] - in /servicemix/smx4/features/trunk: ./
assembly/ assembly/src/main/filtered-resources/ camel/servicemix-camel/
camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ deps/
examples/bridge/ parent/
Author: gertv
Date: Mon Apr 4 18:41:33 2011
New Revision: 1088708
URL: http://svn.apache.org/viewvc?rev=1088708&view=rev
Log:
SMX4-794: Provide a convencience POM for end users
Added:
servicemix/smx4/features/trunk/parent/
servicemix/smx4/features/trunk/parent/pom.xml
Removed:
servicemix/smx4/features/trunk/deps/pom.xml
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java
servicemix/smx4/features/trunk/examples/bridge/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Apr 4 18:41:33 2011
@@ -32,10 +32,6 @@
<packaging>pom</packaging>
<name>Apache ServiceMix :: Features :: Assembly</name>
- <properties>
- <felix.framework.version>3.0.9</felix.framework.version>
- </properties>
-
<dependencies>
<!-- Karaf -->
@@ -56,101 +52,6 @@
<type>xml</type>
</dependency>
- <!-- Felix -->
- <!-- SMX4-764 - Override the Felix Framework version to use 3.0.8 -->
- <!-- SMX4-766 - Upgrade to Felix Framework 3.0.9 -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.framework.version}</version>
- </dependency>
-
- <!-- ServiceMix Components -->
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-bean</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-camel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-cxf-bc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-cxf-se</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-drools</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-eip</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-exec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-file</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-ftp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-jms</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-smpp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-osworkflow</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-quartz</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-saxon</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-scripting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-snmp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-validation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-wsn2005</artifactId>
- </dependency>
-
<!-- ServiceMix NMR -->
<dependency>
<groupId>org.apache.servicemix.nmr</groupId>
@@ -162,496 +63,42 @@
<artifactId>apache-servicemix-nmr</artifactId>
<type>tar.gz</type>
</dependency>
-
<dependency>
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>apache-servicemix-nmr</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
-
- <!-- ServiceMix Specs -->
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr311-api-1.1</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.scripting-api-1.0</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
- </dependency>
-
- <!-- ServiceMix Utils and Shared -->
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-soap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-soap2</artifactId>
- </dependency>
-
- <!-- Aries -->
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.manager</artifactId>
- </dependency>
-
+
+
<!-- ActiveMQ -->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-blueprint</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-console</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-karaf</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pool</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>kahadb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
<artifactId>activemq-karaf</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
-
+
<!-- Camel -->
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>apache-camel</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
- <!-- CXF -->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-jbi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-jbi</artifactId>
- </dependency>
-
- <!-- Geronimo -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- </dependency>
-
- <!-- PAX Web -->
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-whiteboard</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-jsp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-spi</artifactId>
- </dependency>
-
- <!-- PAX URL -->
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-war</artifactId>
- </dependency>
-
- <!-- Spring -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </dependency>
-
- <!-- Spring OSGi -->
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-extender</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-io</artifactId>
- </dependency>
-
- <!-- Bundles -->
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.abdera</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.antlr-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.bcel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.drools</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.fastinfoset</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.groovy</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jdom</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jdt-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jruby</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jsmpp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.mvel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.oscore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.osworkflow</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.oro</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.propertyset</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.quartz</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.rhino</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.saaj-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.saxon</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.velocity</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
- </dependency>
-
- <!-- Other Dependencies -->
- <dependency>
- <groupId>com.google.code.scriptengines</groupId>
- <artifactId>scriptengines-javascript</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.scriptengines</groupId>
- <artifactId>scriptengines-jruby</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.scriptengines</groupId>
- <artifactId>scriptengines-groovy</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.parsers</groupId>
- <artifactId>jaxp-ri</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fusesource.commonman</groupId>
- <artifactId>commons-management</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jexl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-blueprint</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-classloader</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- </dependency>
+ <!-- ODE -->
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-jbi-karaf</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
+
+ <!-- JAXP RI to be included in lib/endorsed -->
<dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-jbi-karaf</artifactId>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
</dependency>
</dependencies>
@@ -665,44 +112,8 @@
</includes>
</resource>
</resources>
- <filters>
- <filter>target/filter.txt</filter>
- </filters>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>create-prop</id>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
- <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
- <property name="mv" value="${karaf.version}" />
- <echo message="Maven version: ${mv}" />
- <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
- <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
- <propertyregex property="ov.p3" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\3" defaultValue=".0" />
- <propertyregex property="ov.p4" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\4" defaultValue="" />
- <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
- <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
- <propertyregex property="ov.p3a" input="${ov.p3}" regexp="(\..+)" replace="\1" defaultValue=".0" />
- <propertyregex property="ov.p4a" input="${ov.p4}" regexp="(\..+)" replace="\1" defaultValue="" />
- <property name="ov" value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}" />
- <echo message="OSGi version: ${ov}" />
- <mkdir dir="target" />
- <echo message="karaf.osgi.version = ${ov}" file="target/filter.txt" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<version>${karaf.version}</version>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Mon Apr 4 18:41:33 2011
@@ -16,10 +16,12 @@
limitations under the License.
-->
<features>
+
<repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
<repository>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</repository>
<repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
<repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
+
<feature name="connector" version="${version}" resolver="(obr)">
<feature version="${aries.version}">transaction</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
@@ -28,7 +30,7 @@
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
- <bundle dependency="true">mvn:org.springframework/spring-context/${spring.version}</bundle>
+ <bundle dependency="true">mvn:org.springframework/spring-context/${spring.version}</bundle> â
<bundle dependency="true">mvn:org.springframework/spring-aop/${spring.version}</bundle>
</feature>
<feature name="cxf" version="${cxf.version}" resolver="(obr)">
@@ -111,7 +113,7 @@
<feature name="examples-cxf-osgi" version="${version}" resolver="(obr)">
<feature version="${version}">cxf-osgi</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
</feature>
@@ -152,13 +154,13 @@
<feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
<feature>cxf-osgi</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
</feature>
<feature name="examples-cxf-wsdl-first-osgi-package" version="${version}" resolver="(obr)">
- <feature version="${servicemix-cxf-bc.version}">servicemix-cxf-bc</feature>
- <feature version="${servicemix-cxf-se.version}">servicemix-cxf-se</feature>
+ <feature version="${servicemix.components.version}">servicemix-cxf-bc</feature>
+ <feature version="${servicemix.components.version}">servicemix-cxf-se</feature>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples.cxf-wsdl-first-osgi-package/wsdl-first-cxfbc-bundle/${version}</bundle>
<bundle>mvn:org.apache.servicemix.examples.cxf-wsdl-first-osgi-package/wsdl-first-cxfse-bundle/${version}</bundle>
@@ -166,7 +168,7 @@
<feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
<feature>cxf-osgi</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
</feature>
@@ -180,16 +182,16 @@
-
-->
- <feature name="servicemix-shared" version="${servicemix-shared.version}" resolver="(obr)">
+ <feature name="servicemix-shared" version="${servicemix.components.version}" resolver="(obr)">
<feature version="${servicemix.nmr.version}">jbi</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
<bundle dependency="true">mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix-utils.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-common/${servicemix-shared.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-common/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-cxf-bc" version="${servicemix-cxf-bc.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-cxf-bc" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
@@ -205,22 +207,22 @@
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-cxf-bc/${servicemix-cxf-bc.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap2/${servicemix.components.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-cxf-bc/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-file" version="${servicemix-file.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
- <bundle>mvn:org.apache.servicemix/servicemix-file/${servicemix-file.version}</bundle>
+ <feature name="servicemix-file" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
+ <bundle>mvn:org.apache.servicemix/servicemix-file/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-ftp" version="${servicemix-ftp.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-ftp" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
<bundle dependency="true">mvn:commons-net/commons-net/${commons-net.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix-ftp.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-ftp/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-http" version="${servicemix-http.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-http" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
@@ -228,77 +230,77 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap/${servicemix.components.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap2/${servicemix.components.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-jms" version="${servicemix-jms.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-jms" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap/${servicemix.components.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix/servicemix-soap2/${servicemix.components.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-jms/${spring.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-tx/${spring.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-jms/${servicemix-jms.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-jms/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-mail" version="${servicemix-mail.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-mail" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:javax.mail/mail/${javax.mail.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-mail/${servicemix-mail.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-mail/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-bean" version="${servicemix-bean.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-bean" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix-bean.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-bean/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-camel" version="${servicemix-camel.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-camel" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<feature version="${camel.version}">camel</feature>
- <bundle>mvn:org.apache.servicemix/servicemix-camel/${servicemix-camel.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-camel/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-drools" version="${servicemix-drools.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-drools" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdt-core/${jdt-core.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr-runtime/${antlr-runtime.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-drools/${servicemix-drools.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-drools/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-cxf-se" version="${servicemix-cxf-se.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-cxf-se" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<feature version="${cxf.version}">cxf</feature>
<bundle>mvn:org.apache.cxf/cxf-rt-bindings-jbi/${cxf.version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-transports-jbi/${cxf.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-cxf-se/${servicemix-cxf-se.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-cxf-se/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-eip" version="${servicemix-eip.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
- <bundle>mvn:org.apache.servicemix/servicemix-eip/${servicemix-eip.version}</bundle>
+ <feature name="servicemix-eip" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
+ <bundle>mvn:org.apache.servicemix/servicemix-eip/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-osworkflow" version="${servicemix-osworkflow.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-osworkflow" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscore/${oscore.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.propertyset/${propertyset.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.osworkflow/${osworkflow.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-osworkflow/${servicemix-osworkflow.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-osworkflow/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-quartz" version="${servicemix-quartz.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-quartz" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-context-support/${spring.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-quartz/${servicemix-quartz.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-quartz/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-scripting" version="${servicemix-scripting.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-scripting" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr2.bundle.version}</bundle>
@@ -308,45 +310,45 @@
<bundle dependency="true">mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines.version}</bundle>
<bundle dependency="true">mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines.version}</bundle>
<bundle dependency="true">mvn:com.google.code.scriptengines/scriptengines-jruby/${scriptengines.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-scripting/${servicemix-scripting.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-scripting/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-validation" version="${servicemix-validation.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
- <bundle>mvn:org.apache.servicemix/servicemix-validation/${servicemix-validation.version}</bundle>
+ <feature name="servicemix-validation" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
+ <bundle>mvn:org.apache.servicemix/servicemix-validation/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-saxon" version="${servicemix-saxon.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-saxon" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-saxon/${servicemix-saxon.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-saxon/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-wsn2005" version="${servicemix-wsn2005.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-wsn2005" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<feature version="${activemq.version}">activemq</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws-api.version}/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-impl.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-wsn2005/${servicemix-wsn2005.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-wsn2005/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-snmp" version="${servicemix-snmp.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-snmp" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-snmp/${servicemix-snmp.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-snmp/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-vfs" version="${servicemix-vfs.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-vfs" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-vfs/${commons-vfs.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-vfs/${servicemix-vfs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-vfs/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-smpp" version="${servicemix-smpp.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
+ <feature name="servicemix-smpp" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix/servicemix-smpp/${servicemix-smpp.version}</bundle>
+ <bundle>mvn:org.apache.servicemix/servicemix-smpp/${servicemix.components.version}</bundle>
</feature>
- <feature name="servicemix-exec" version="${servicemix-exec.version}" resolver="(obr)">
- <feature version="${servicemix-shared.version}">servicemix-shared</feature>
- <bundle>mvn:org.apache.servicemix/servicemix-exec/${servicemix-exec.version}</bundle>
+ <feature name="servicemix-exec" version="${servicemix.components.version}" resolver="(obr)">
+ <feature version="${servicemix.components.version}">servicemix-shared</feature>
+ <bundle>mvn:org.apache.servicemix/servicemix-exec/${servicemix.components.version}</bundle>
</feature>
<!-- Default broker configuration -->
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Mon Apr 4 18:41:33 2011
@@ -150,12 +150,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/AbstractComponentTest.java Mon Apr 4 18:41:33 2011
@@ -16,8 +16,8 @@
*/
package org.apache.servicemix.camel.nmr;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.servicemix.executors.ExecutorFactory;
import org.apache.servicemix.executors.impl.ExecutorConfig;
import org.apache.servicemix.executors.impl.ExecutorFactoryImpl;
@@ -37,14 +37,14 @@ import java.util.List;
* - the NMR component is available with URI prefix nmr:
* - a client channel to the NMR can be obtained with the {@link #getChannel()} method
*/
-public abstract class AbstractComponentTest extends ContextTestSupport implements ExchangeListener {
+public abstract class AbstractComponentTest extends CamelTestSupport implements ExchangeListener {
private ServiceMix nmr;
private ServiceMixComponent component;
private Channel channel;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
nmr = new ServiceMix();
nmr.setExecutorFactory(createExecutorFactory());
nmr.init();
@@ -58,7 +58,7 @@ public abstract class AbstractComponentT
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
for (ServiceMixProducer producer : findEndpoints(ServiceMixProducer.class)) {
if (producer.getContinuations().size() > 0) {
// let's wait for a moment to give the last exchanges the time to get Done
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelAsyncRouteTest.java Mon Apr 4 18:41:33 2011
@@ -25,6 +25,8 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.servicemix.nmr.api.Status;
+import org.junit.Test;
+
/**
* Test case for making sure that the component behaves properly if the Camel route is using
* asynchronous elements (e.g. threads or seda queues)
@@ -40,12 +42,13 @@ public class CamelAsyncRouteTest extends
private CountDownLatch done;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
done = new CountDownLatch(COUNT);
}
+ @Test
public void testCamelThreads() throws InterruptedException {
expectDefaultMessageCount("mock:sent");
expectDefaultMessageCount("mock:threads").whenAnyExchangeReceived(new AssertHandledByCamelThreadProcessor());
@@ -60,6 +63,7 @@ public class CamelAsyncRouteTest extends
done.await(DELAY, TimeUnit.MILLISECONDS));
}
+ @Test
public void testCamelSeda() throws InterruptedException {
expectDefaultMessageCount("mock:sent");
expectDefaultMessageCount("mock:seda");
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CamelTryCatchTest.java Mon Apr 4 18:41:33 2011
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
/**
* A very basic NMR test, just testing if the Exchange can flow through the NMR
@@ -29,6 +30,7 @@ public class CamelTryCatchTest extends A
private static final String REQUEST_MESSAGE = "Simple message body";
+ @Test
public void testInOnlyTryCatch() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:caught");
mock.expectedMessageCount(1);
@@ -38,6 +40,7 @@ public class CamelTryCatchTest extends A
assertMockEndpointsSatisfied();
}
+ @Test
public void testInOutTryCatch() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:caught");
mock.expectedMessageCount(1);
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/MultipleProducersTest.java Mon Apr 4 18:41:33 2011
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -33,6 +34,7 @@ public class MultipleProducersTest exten
private static final int COUNT = 100;
+ @Test
public void testConcurrentlyUsingTheSameProducerName() throws InterruptedException {
getMockEndpoint("mock:handler").expectedMessageCount(2 * COUNT);
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.java?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SecuritySubjectTest.java Mon Apr 4 18:41:33 2011
@@ -21,6 +21,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import javax.security.auth.Subject;
import java.security.Principal;
@@ -39,6 +40,7 @@ public class SecuritySubjectTest extends
/*
* Test case for conveying security subject information in an InOnly MEP
*/
+ @Test
public void testInOnlyWithSecuritySubject() throws Exception {
Subject subject = createSubject(CLARK_KENT);
@@ -54,6 +56,7 @@ public class SecuritySubjectTest extends
/*
* Test case for conveying security subject information in an InOut MEP
*/
+ @Test
public void testInOutWithSecuritySubject() throws Exception {
final Subject subject = createSubject(CLARK_KENT);
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ServiceMixBindingTest.java Mon Apr 4 18:41:33 2011
@@ -19,6 +19,7 @@ package org.apache.servicemix.camel.nmr;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.servicemix.nmr.api.Exchange;
import org.apache.servicemix.nmr.api.Pattern;
+import org.junit.Test;
/**
* Test cases for {@link org.apache.servicemix.camel.nmr.ServiceMixBinding}
@@ -31,6 +32,7 @@ public class ServiceMixBindingTest exten
private ServiceMixBinding binding = new ServiceMixBinding();
+ @Test
public void testToCamelAndBackToNmr() {
Exchange nmr = getChannel().createExchange(Pattern.InOnly);
nmr.setProperty(KEY, VALUE);
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ShouldRunSynchronouslyTest.java Mon Apr 4 18:41:33 2011
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
/**
* Test case for the ?synchronous=true setting on a camel consumer endpoint
@@ -28,6 +29,7 @@ public class ShouldRunSynchronouslyTest
private static final String HANDLED_BY_THREAD = "HandledByThread";
+ @Test
public void testProcessingOnSameThread() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:simple");
mock.expectedBodiesReceived("Simple message body");
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SimpleNmrTest.java Mon Apr 4 18:41:33 2011
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
/**
* A very basic NMR test, just testing if the Exchange can flow through the NMR
@@ -30,6 +31,7 @@ public class SimpleNmrTest extends Abstr
private static final String REQUEST_MESSAGE = "Simple message body";
private static final String RESPONSE_MESSAGE = "Simple message reply";
+ @Test
public void testSimpleInOnly() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:simple");
mock.expectedBodiesReceived(REQUEST_MESSAGE);
@@ -39,6 +41,7 @@ public class SimpleNmrTest extends Abstr
assertMockEndpointsSatisfied();
}
+ @Test
public void testSimpleInOnlyWithMultipleHops() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:hops");
mock.expectedBodiesReceived(REQUEST_MESSAGE);
@@ -48,6 +51,7 @@ public class SimpleNmrTest extends Abstr
assertMockEndpointsSatisfied();
}
+ @Test
public void testSimpleInOut() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:simple");
mock.expectedBodiesReceived(REQUEST_MESSAGE);
@@ -59,6 +63,7 @@ public class SimpleNmrTest extends Abstr
RESPONSE_MESSAGE, response);
}
+ @Test
public void testSimpleInOutWithMultipleHops() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:hops");
mock.expectedBodiesReceived(REQUEST_MESSAGE);
@@ -70,6 +75,7 @@ public class SimpleNmrTest extends Abstr
RESPONSE_MESSAGE, response);
}
+ @Test
public void testSimpleInvalidEndpoint() throws InterruptedException {
Exchange exchange = template.send("direct:error", new Processor() {
public void process(Exchange exchange) throws Exception {
Modified: servicemix/smx4/features/trunk/examples/bridge/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/bridge/pom.xml?rev=1088708&r1=1088707&r2=1088708&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/bridge/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/bridge/pom.xml Mon Apr 4 18:41:33 2011
@@ -49,5 +49,5 @@
</plugin>
</plugins>
</build>
-
+
</project>