Author: gnodet
Date: Tue Jul 1 03:21:04 2008
New Revision: 673049
URL: http://svn.apache.org/viewvc?rev=673049&view=rev
Log:
Use extracted bundles
Removed:
servicemix/smx4/features/trunk/camel/bundles/
servicemix/smx4/features/trunk/cxf/bundles/
servicemix/smx4/features/trunk/transaction/bundles/
servicemix/smx4/features/trunk/war/bundles/
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/camel/pom.xml
servicemix/smx4/features/trunk/cxf/pom.xml
servicemix/smx4/features/trunk/examples/itests/pom.xml
servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/pom.xml
servicemix/smx4/features/trunk/transaction/pom.xml
servicemix/smx4/features/trunk/transaction/transaction/pom.xml
servicemix/smx4/features/trunk/war/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Tue Jul 1 03:21:04 2008
@@ -149,28 +149,28 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.howl-1.0.1-1</artifactId>
- <version>${version}</version>
+ <artifactId>org.apache.servicemix.bundles.howl</artifactId>
+ <version>${howl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
- <version>${servicemix.kernel.version}</version>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jencks-2.1</artifactId>
- <version>${version}</version>
+ <artifactId>org.apache.servicemix.bundles.jencks</artifactId>
+ <version>${jencks.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.saaj-impl-1.3</artifactId>
- <version>${version}</version>
+ <artifactId>org.apache.servicemix.bundles.saaj-impl</artifactId>
+ <version>${saaj.impl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.woodstox-3.2.3</artifactId>
- <version>${servicemix.nmr.version}</version>
+ <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+ <version>${woodstox.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -179,28 +179,28 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
- <version>${version}</version>
+ <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
+ <version>${neethi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.xmlschema-1.4.2</artifactId>
- <version>${version}</version>
+ <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId>
+ <version>${xmlschema.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
- <version>${version}</version>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+ <version>${xmlresolver.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.jaxb-impl-2.1.6</artifactId>
- <version>${version}</version>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>${jaxb.impl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
- <version>${version}</version>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
@@ -440,7 +440,7 @@
<version>${commons.pool.version}</version>
</dependency>
<!-- Dependencies not included directly, but repackaged in bundles.
- Listed for legal reasons (and LICENSE file generation) -->
+ Listed for legal reasons (and LICENSE file generation)
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
@@ -473,6 +473,7 @@
<artifactId>wsdl4j</artifactId>
<version>1.6.1</version>
</dependency>
+ -->
</dependencies>
<build>
<resources>
@@ -518,147 +519,147 @@
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-http</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-http-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jms</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-jms-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-drools</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-drools-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-eip</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-eip-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-script</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-script-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-scripting</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-scripting-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-validation</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-validation-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-file</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-file-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-ftp</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-ftp-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-xmpp</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-xmpp-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-saxon</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-saxon-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-quartz</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-quartz-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jsr181</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-jsr181-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-mail</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-mail-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-osworkflow</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-osworkflow-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-bean</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-bean-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-truezip</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-truezip-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-cxf-se</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-cxf-se-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-cxf-bc</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-cxf-bc-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-camel</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-camel-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-shared</artifactId>
- <version>${components.version}</version>
+ <version>${servicemix-shared-version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
Tue Jul 1 03:21:04 2008
@@ -148,7 +148,7 @@
<!-- NMR / JBI -->
<include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.xbean:xbean-classloader</include>
<include>org.apache.servicemix.document:org.apache.servicemix.document</include>
@@ -172,8 +172,8 @@
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.springframework:spring-tx</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.howl-1.0.1-1</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jencks-2.1</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.howl</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jencks</include>
<include>org.apache.geronimo.components:geronimo-connector</include>
<include>org.apache.geronimo.components:geronimo-transaction</include>
<include>org.apache.servicemix.transaction:org.apache.servicemix.transaction</include>
@@ -204,17 +204,17 @@
<include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
<include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm-2.2.3</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
<include>org.apache.cxf:cxf-bundle</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.1</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl-2.1.6</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.1</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.neethi-2.0.2</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl-1.3</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j-1.6.1</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlschema-1.4.2</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlresolver-1.2</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.neethi</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlschema</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlresolver</include>
<include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.nmr</include>
<include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.osgi</include>
<include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.binding.nmr</include>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Tue Jul 1 03:21:04 2008
@@ -126,7 +126,7 @@
<!-- NMR / JBI -->
<include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.xbean:xbean-classloader</include>
<include>org.apache.servicemix.document:org.apache.servicemix.document</include>
@@ -150,8 +150,8 @@
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.springframework:spring-tx</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.howl-1.0.1-1</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jencks-2.1</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.howl</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jencks</include>
<include>org.apache.geronimo.components:geronimo-connector</include>
<include>org.apache.geronimo.components:geronimo-transaction</include>
<include>org.apache.servicemix.transaction:org.apache.servicemix.transaction</include>
@@ -182,17 +182,17 @@
<include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
<include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm-2.2.3</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
<include>org.apache.cxf:cxf-bundle</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.1</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl-2.1.6</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.1</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.neethi-2.0.2</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl-1.3</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j-1.6.1</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlschema-1.4.2</include>
-
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlresolver-1.2</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.neethi</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlschema</include>
+
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlresolver</include>
<include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.nmr</include>
<include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.transport.osgi</include>
<include>org.apache.servicemix.cxf:org.apache.servicemix.cxf.binding.nmr</include>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Tue Jul 1 03:21:04 2008
@@ -33,10 +33,10 @@
#
# The rest of the services..
#
-org.apache.servicemix.bundles.ant-${ant.version}-${servicemix.kernel.version}.jar=40
-org.apache.servicemix.bundles.aopalliance-${aopalliance.version}-${servicemix.kernel.version}.jar=40
-org.apache.servicemix.bundles.cglib-${cglib.version}-${servicemix.kernel.version}.jar=40
-org.apache.servicemix.bundles.mina-${mina.version}-${servicemix.kernel.version}.jar=40
+org.apache.servicemix.bundles.ant-${ant.version}.jar=40
+org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=40
+org.apache.servicemix.bundles.cglib-${cglib.version}.jar=40
+org.apache.servicemix.bundles.mina-${mina.version}.jar=40
geronimo-activation_1.1_spec-${geronimo.activation.version}.jar=40
spring-aop-${spring.version}.jar=40
spring-beans-${spring.version}.jar=40
@@ -76,8 +76,8 @@
geronimo-jta_1.1_spec-${geronimo.jta.version}.jar=50
geronimo-j2ee-connector_1.5_spec-${geronimo.j2ee.connector.version}.jar=50
spring-tx-${spring.version}.jar=50
-org.apache.servicemix.bundles.howl-1.0.1-1-${version}.jar=50
-org.apache.servicemix.bundles.jencks-2.1-${version}.jar=50
+org.apache.servicemix.bundles.howl-${howl.version}.jar=50
+org.apache.servicemix.bundles.jencks-${jencks.version}.jar=50
geronimo-connector-${geronimo.connector.version}.jar=50
geronimo-transaction-${geronimo.transaction.version}.jar=50
org.apache.servicemix.transaction-${version}.jar=50
@@ -109,15 +109,15 @@
org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar=50
org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar=50
-org.apache.servicemix.bundles.asm-2.2.3-${servicemix.kernel.version}.jar=50
+org.apache.servicemix.bundles.asm-${asm.version}.jar=50
cxf-bundle-${cxf.version}.jar=50
-org.apache.servicemix.bundles.jaxb-impl-2.1.6-${version}.jar=50
-org.apache.servicemix.bundles.neethi-2.0.2-${version}.jar=50
-org.apache.servicemix.bundles.saaj-impl-1.3-${version}.jar=50
-org.apache.servicemix.bundles.woodstox-3.2.3-${servicemix.nmr.version}.jar=50
-org.apache.servicemix.bundles.wsdl4j-1.6.1-${version}.jar=50
-org.apache.servicemix.bundles.xmlschema-1.4.2-${version}.jar=50
-org.apache.servicemix.bundles.xmlresolver-1.2-${version}.jar=50
+org.apache.servicemix.bundles.jaxb-impl-${jaxb.impl.version}.jar=50
+org.apache.servicemix.bundles.neethi-${neethi.version}.jar=50
+org.apache.servicemix.bundles.saaj-impl-${saaj.impl.version}.jar=50
+org.apache.servicemix.bundles.woodstox-${woodstox.version}.jar=50
+org.apache.servicemix.bundles.wsdl4j-${wsdl4j.version}.jar=50
+org.apache.servicemix.bundles.xmlschema-${xmlschema.version}.jar=50
+org.apache.servicemix.bundles.xmlresolver-${xmlresolver.version}.jar=50
org.apache.servicemix.cxf.transport.nmr-${version}.jar=50
org.apache.servicemix.cxf.transport.osgi-${version}.jar=50
org.apache.servicemix.cxf.binding.nmr-${version}.jar=50
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=673049&r1=673048&r2=673049&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
Tue Jul 1 03:21:04 2008
@@ -50,13 +50,13 @@
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm-2.2.3/${servicemix.kernel.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl-2.1.6/${version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi-2.0.2/${version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox-3.2.3/${servicemix.nmr.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1/${version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema-1.4.2/${version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver-1.2/${version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.impl.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi/${neethi.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox/${woodstox.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-bundle/${cxf.version}</bundle>
</feature>
<feature name="cxf-osgi">
@@ -76,7 +76,7 @@
<bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl-2.1.6/${version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.impl.version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring/${camel.version}</bundle>
Modified: servicemix/smx4/features/trunk/camel/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/pom.xml?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/pom.xml Tue Jul 1 03:21:04 2008
@@ -34,7 +34,6 @@
<name>Apache ServiceMix Features :: Camel</name>
<modules>
- <module>bundles</module>
<module>servicemix-camel</module>
</modules>
Modified: servicemix/smx4/features/trunk/cxf/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/pom.xml?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/pom.xml Tue Jul 1 03:21:04 2008
@@ -33,7 +33,6 @@
<name>Apache ServiceMix CXF Support</name>
<modules>
- <module>bundles</module>
<module>cxf-transport-nmr</module>
<module>cxf-transport-osgi</module>
<module>cxf-binding-nmr</module>
Modified: servicemix/smx4/features/trunk/examples/itests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/pom.xml?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/pom.xml Tue Jul 1 03:21:04
2008
@@ -70,38 +70,38 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.ant-${ant.version}</artifactId>
- <version>${servicemix.kernel.version}</version>
+ <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+ <version>${ant.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.jaxb-impl-${jaxb.impl.version}</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>${jaxb.impl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
+ <version>${neethi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.woodstox-3.2.3</artifactId>
- <version>${servicemix.nmr.version}</version>
+ <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+ <version>${woodstox.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.xmlschema-1.4.2</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId>
+ <version>${xmlschema.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
- <version>${project.version}</version>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+ <version>${xmlresolver.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified:
servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Tue Jul 1 03:21:04 2008
@@ -65,13 +65,13 @@
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.saaj-api-1.3"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.1"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.1"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm-2.2.3"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl-2.1.6"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.neethi-2.0.2"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.woodstox-3.2.3"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j-1.6.1"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlschema-1.4.2"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver-1.2"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.neethi"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.woodstox"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlschema"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver"),
getBundle("org.mortbay.jetty", "jetty-util"),
getBundle("org.mortbay.jetty", "jetty"),
getBundle("org.ops4j.pax.web", "pax-web-bundle"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Jul 1 03:21:04 2008
@@ -62,12 +62,14 @@
<properties>
<activemq.version>5.2-SNAPSHOT</activemq.version>
<acegi.version>1.0.0</acegi.version>
- <ant.version>1.7.0</ant.version>
- <aopalliance.version>1.0</aopalliance.version>
- <asm.version>2.2.3</asm.version>
+ <ant.version>1.7.0_1-SNAPSHOT</ant.version>
+ <aopalliance.version>1.0_1-SNAPSHOT</aopalliance.version>
+ <asm.version>2.2.3_1-SNAPSHOT</asm.version>
<bnd.version>0.0.227</bnd.version>
- <cglib.version>2.1_3</cglib.version>
+ <cglib.version>2.1_3_1-SNAPSHOT</cglib.version>
<camel.version>1.4-SNAPSHOT</camel.version>
+ <commons-io.version>1.3.2_1-SNAPSHOT</commons-io.version>
+ <commons-jxpath.version>1.2_1-SNAPSHOT</commons-jxpath.version>
<commons.logging.version>1.1</commons.logging.version>
<commons.pool.version>1.4</commons.pool.version>
<components.version>4.0-SNAPSHOT</components.version>
@@ -76,7 +78,7 @@
<felix.compendium.version>1.0.0</felix.compendium.version>
<felix.configadmin.version>1.0.0</felix.configadmin.version>
<felix.core.version>1.0.0</felix.core.version>
- <felix.osgi.version>1.0.0</felix.osgi.version>
+ <felix.osgi.version>1.0.1</felix.osgi.version>
<felix.plugin.version>1.4.0</felix.plugin.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
<geronimo.activation.version>1.0.2</geronimo.activation.version>
@@ -97,34 +99,62 @@
<geronimo.wsmetadata.version>1.1.2</geronimo.wsmetadata.version>
<geronimo.transaction.version>2.2-r634076</geronimo.transaction.version>
<geronimo.connector.version>2.2-r634076</geronimo.connector.version>
- <howl.version>1.0.1-1</howl.version>
- <jasper.version>6.0.14</jasper.version>
+ <howl.version>1.0.1-1_1-SNAPSHOT</howl.version>
+ <jasper.version>6.0.14_1-SNAPSHOT</jasper.version>
<jaxb.api.version>2.1</jaxb.api.version>
- <jaxb.impl.version>2.1.6</jaxb.impl.version>
+ <jaxb.impl.version>2.1.6_1-SNAPSHOT</jaxb.impl.version>
<jaxws.api.version>2.1</jaxws.api.version>
- <jencks.version>2.1</jencks.version>
+ <jencks.version>2.1_1-SNAPSHOT</jencks.version>
<jetty.version>6.1.9</jetty.version>
<jline.version>0.9.94</jline.version>
<junit.version>4.4</junit.version>
<log4j.version>1.2.14</log4j.version>
- <mina.version>1.1.6</mina.version>
+ <mina.version>1.1.6_1-SNAPSHOT</mina.version>
+ <neethi.version>2.0.4_1-SNAPSHOT</neethi.version>
<openejb.version>3.0-beta-2</openejb.version>
<openjpa.version>1.0.1</openjpa.version>
<pax.logging.version>1.1.1</pax.logging.version>
<pax.url.version>0.3.0</pax.url.version>
<pax.web.version>0.4.1</pax.web.version>
<pax.web.extender.version>0.3.0</pax.web.extender.version>
+ <saaj.impl.version>1.3_1-SNAPSHOT</saaj.impl.version>
<servicemix3.version>3.3-SNAPSHOT</servicemix3.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.kernel.version>1.0.0-SNAPSHOT</servicemix.kernel.version>
<servicemix.nmr.version>1.0-m2-SNAPSHOT</servicemix.nmr.version>
<servicemix.specs.version>1.0.0</servicemix.specs.version>
+
+ <servicemix-shared-version>4.0-SNAPSHOT</servicemix-shared-version>
+ <servicemix-quartz-version>4.0-SNAPSHOT</servicemix-quartz-version>
+ <servicemix-jms-version>4.0-SNAPSHOT</servicemix-jms-version>
+ <servicemix-jsr181-version>4.0-SNAPSHOT</servicemix-jsr181-version>
+ <servicemix-http-version>4.0-SNAPSHOT</servicemix-http-version>
+ <servicemix-mail-version>4.0-SNAPSHOT</servicemix-mail-version>
+
<servicemix-osworkflow-version>4.0-SNAPSHOT</servicemix-osworkflow-version>
+ <servicemix-wsn2005-version>4.0-SNAPSHOT</servicemix-wsn2005-version>
+ <servicemix-bean-version>4.0-SNAPSHOT</servicemix-bean-version>
+ <servicemix-eip-version>4.0-SNAPSHOT</servicemix-eip-version>
+ <servicemix-script-version>4.0-SNAPSHOT</servicemix-script-version>
+ <servicemix-scripting-version>4.0-SNAPSHOT</servicemix-scripting-version>
+
<servicemix-validation-version>4.0-SNAPSHOT</servicemix-validation-version>
+ <servicemix-ftp-version>4.0-SNAPSHOT</servicemix-ftp-version>
+ <servicemix-xmpp-version>4.0-SNAPSHOT</servicemix-xmpp-version>
+ <servicemix-saxon-version>4.0-SNAPSHOT</servicemix-saxon-version>
+ <servicemix-truezip-version>4.0-SNAPSHOT</servicemix-truezip-version>
+ <servicemix-camel-version>4.0-SNAPSHOT</servicemix-camel-version>
+ <servicemix-cxf-bc-version>4.0-SNAPSHOT</servicemix-cxf-bc-version>
+ <servicemix-cxf-se-version>4.0-SNAPSHOT</servicemix-cxf-se-version>
+ <servicemix-drools-version>4.0-SNAPSHOT</servicemix-drools-version>
+ <servicemix-file-version>4.0-SNAPSHOT</servicemix-file-version>
+
<spring.version>2.5.4</spring.version>
<spring.osgi.version>1.1.0-m2</spring.osgi.version>
+ <wsdl4j.version>1.6.1_1-SNAPSHOT</wsdl4j.version>
+ <woodstox.version>3.2.6_1-SNAPSHOT</woodstox.version>
<xstream.version>1.2.2</xstream.version>
<xbean.version>3.4.2</xbean.version>
- <commons-io.version>1.3.2</commons-io.version>
- <commons-jxpath.version>1.2</commons-jxpath.version>
+ <xmlschema.version>1.4.2_1-SNAPSHOT</xmlschema.version>
+ <xmlresolver.version>1.2_1-SNAPSHOT</xmlresolver.version>
</properties>
<repositories>
Modified: servicemix/smx4/features/trunk/transaction/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/pom.xml?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/transaction/pom.xml (original)
+++ servicemix/smx4/features/trunk/transaction/pom.xml Tue Jul 1 03:21:04 2008
@@ -34,7 +34,6 @@
<name>Apache ServiceMix Features :: Transaction</name>
<modules>
- <module>bundles</module>
<module>transaction</module>
</modules>
Modified: servicemix/smx4/features/trunk/transaction/transaction/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/transaction/pom.xml?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/transaction/transaction/pom.xml (original)
+++ servicemix/smx4/features/trunk/transaction/transaction/pom.xml Tue Jul 1
03:21:04 2008
@@ -50,13 +50,13 @@
<version>${geronimo.connector.version}</version>
</dependency>
<dependency>
- <groupId>org.jencks</groupId>
- <artifactId>jencks</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jencks</artifactId>
<version>${jencks.version}</version>
</dependency>
<dependency>
- <groupId>org.objectweb.howl</groupId>
- <artifactId>howl</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.howl</artifactId>
<version>${howl.version}</version>
</dependency>
<dependency>
Modified: servicemix/smx4/features/trunk/war/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/war/pom.xml?rev=673049&r1=673048&r2=673049&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/war/pom.xml (original)
+++ servicemix/smx4/features/trunk/war/pom.xml Tue Jul 1 03:21:04 2008
@@ -33,7 +33,6 @@
<name>Apache ServiceMix WAR Support</name>
<modules>
- <module>bundles</module>
<module>deployer</module>
</modules>
