You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/08/28 01:27:58 UTC
svn commit: r808678 - in /servicemix/smx4:
features/trunk/assembly/src/main/filtered-resources/ nmr/trunk/
nmr/trunk/assembly/ nmr/trunk/assembly/src/main/filtered-resources/
nmr/trunk/jbi/itests/
nmr/trunk/jbi/itests/src/test/java/org/apache/servicemi...
Author: ccustine
Date: Thu Aug 27 23:27:57 2009
New Revision: 808678
URL: http://svn.apache.org/viewvc?rev=808678&view=rev
Log:
SMX4-335 Replace the Geronimo mail bundle with Sun's ri
- I've gone ahead and removed the geronimo API spec jar completely. ServiceMix Mail component was wiring to the older geronimo API spec so it couldn't find the Sun RI impl. Best to just have one for now.
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/nmr/trunk/assembly/pom.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/itests/IntegrationTest.java
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
servicemix/smx4/nmr/trunk/pom.xml
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=808678&r1=808677&r2=808678&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 Thu Aug 27 23:27:57 2009
@@ -51,11 +51,11 @@
<feature name="cxf" version="${cxf.version}">
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.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-ws-metadata_2.0_spec/${geronimo.wsmetadata.version}</bundle>
<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-${jaxb.api.version}/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix.specs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax.mail/${javax.mail.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.fastinfoset/${fastinfoset.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.impl.version}</bundle>
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=808678&r1=808677&r2=808678&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Thu Aug 27 23:27:57 2009
@@ -144,8 +144,8 @@
<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.javamail-api-1.4</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
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=808678&r1=808677&r2=808678&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 Thu Aug 27 23:27:57 2009
@@ -52,8 +52,8 @@
<feature version="${version}">naming</feature>
<feature version="${version}">transaction</feature>
<feature version="${version}">nmr</feature>
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax.mail/${javax.mail.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.ant/${ant.version}</bundle>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=808678&r1=808677&r2=808678&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Thu Aug 27 23:27:57 2009
@@ -154,8 +154,8 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.javamail-api-1.4</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java?rev=808678&r1=808677&r2=808678&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java Thu Aug 27 23:27:57 2009
@@ -70,7 +70,6 @@
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.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"),
@@ -87,6 +86,7 @@
getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.deployer"),
getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.osgi"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.ant"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax.mail"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.woodstox"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
};
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?rev=808678&r1=808677&r2=808678&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java Thu Aug 27 23:27:57 2009
@@ -55,7 +55,6 @@
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.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"),
@@ -72,6 +71,7 @@
getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.deployer"),
getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.osgi"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.ant"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax.mail"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.woodstox"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
};
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=808678&r1=808677&r2=808678&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Thu Aug 27 23:27:57 2009
@@ -86,6 +86,7 @@
<geronimo.transaction.version>2.2-r634076</geronimo.transaction.version>
<howl.version>1.0.1-1_1</howl.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
+ <javax.mail.version>1.4.1_1-SNAPSHOT</javax.mail.version>
<jencks.version>2.1_1</jencks.version>
<jline.version>0.9.94</jline.version>
<junit.version>3.8.2_1</junit.version>
@@ -436,9 +437,9 @@
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.javamail-api-1.4</artifactId>
- <version>${servicemix.specs.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
+ <version>${javax.mail.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>