You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/12/29 15:17:31 UTC
svn commit: r729893 - in /servicemix/smx4/nmr/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
jbi/itests/ jbi/itests/src/test/java/org/apache/servicemix/jbi/
Author: ffang
Date: Mon Dec 29 06:17:31 2008
New Revision: 729893
URL: http://svn.apache.org/viewvc?rev=729893&view=rev
Log:
[SMX4-183]use servicemix javamail api and activation bundle jar but not geronimo javamail and activation api bundle
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=729893&r1=729892&r2=729893&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Mon Dec 29 06:17:31 2008
@@ -115,14 +115,14 @@
<version>${felix.prefs.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>${geronimo.activation.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+ <version>${servicemix.specs.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>${geronimo.javamail.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.javamail-api-1.4</artifactId>
+ <version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=729893&r1=729892&r2=729893&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Dec 29 06:17:31 2008
@@ -106,8 +106,8 @@
<scope>runtime</scope>
<includes>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
- <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.javamail-api-1.4</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
<include>org.apache.xbean:xbean-classloader</include>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=729893&r1=729892&r2=729893&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Dec 29 06:17:31 2008
@@ -98,8 +98,8 @@
<scope>runtime</scope>
<includes>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
- <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.javamail-api-1.4</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox</include>
<include>org.apache.xbean:xbean-classloader</include>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml?rev=729893&r1=729892&r2=729893&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml Mon Dec 29 06:17:31 2008
@@ -28,8 +28,8 @@
</feature>
<feature name="jbi" version="${version}">
<feature>nmr</feature>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}</bundle>
<bundle>mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox/${woodstox.version}</bundle>
@@ -40,4 +40,4 @@
<bundle>mvn:org.apache.servicemix.jbi/org.apache.servicemix.jbi.commands/${pom.version}</bundle>
<bundle>mvn:org.apache.servicemix.jbi/org.apache.servicemix.jbi.management/${pom.version}</bundle>
</feature>
-</features>
\ No newline at end of file
+</features>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=729893&r1=729892&r2=729893&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Mon Dec 29 06:17:31 2008
@@ -213,9 +213,14 @@
<version>${geronimo.jta.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>${geronimo.javamail.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.javamail-api-1.4</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+ <version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java?rev=729893&r1=729892&r2=729893&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java Mon Dec 29 06:17:31 2008
@@ -65,8 +65,8 @@
return new String[] {
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.stax-api-1.0"),
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jbi-api-1.0"),
- getBundle("org.apache.geronimo.specs", "geronimo-activation_1.1_spec"),
- getBundle("org.apache.geronimo.specs", "geronimo-javamail_1.4_spec"),
+ getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.activation-api-1.1"),
+ getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.javamail-api-1.4"),
getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
getBundle("org.apache.felix", "org.apache.felix.prefs"),
getBundle("org.apache.xbean", "xbean-classloader"),
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=729893&r1=729892&r2=729893&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Mon Dec 29 06:17:31 2008
@@ -72,8 +72,6 @@
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.bundlerepository.version>1.2.0</felix.bundlerepository.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
- <geronimo.activation.version>1.0.2</geronimo.activation.version>
- <geronimo.javamail.version>1.5</geronimo.javamail.version>
<geronimo.jta.version>1.1.1</geronimo.jta.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<geronimo.stax.version>1.0.1</geronimo.stax.version>
@@ -89,7 +87,7 @@
<servicemix.shared.version>2008.02-SNAPSHOT</servicemix.shared.version>
<servicemix.kernel.version>1.1.0-SNAPSHOT</servicemix.kernel.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.specs.version>1.1.0</servicemix.specs.version>
+ <servicemix.specs.version>1.2-SNAPSHOT</servicemix.specs.version>
<spring.osgi.version>1.1.0</spring.osgi.version>
<spring.version>2.5.5</spring.version>
<woodstox.version>3.2.7_1</woodstox.version>