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 2009/08/24 13:24:35 UTC
svn commit: r807151 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/filtered-resources/
camel/camel-features/src/main/resources/ examples/itests/tests/
examples/itests/tests/src/test/java/org/apache/servicemix/examples/
Author: ffang
Date: Mon Aug 24 11:24:34 2009
New Revision: 807151
URL: http://svn.apache.org/viewvc?rev=807151&view=rev
Log:
[SMX4-335]Replace the Geronimo mail bundle with Sun's ri
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
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=807151&r1=807150&r2=807151&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Aug 24 11:24:34 2009
@@ -62,9 +62,9 @@
</dependency>
<!-- adding other dependencies for the SMX4 assembly -->
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>com.springsource.javax.activation</artifactId>
- <version>${spring.javax.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.components</groupId>
@@ -434,9 +434,9 @@
<version>${geronimo.connector.version}</version>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>com.springsource.javax.mail</artifactId>
- <version>${spring.javax.mail.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.servicemix.bundles</groupId>
@@ -829,11 +829,6 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
</repositories>
<build>
<resources>
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=807151&r1=807150&r2=807151&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 Aug 24 11:24:34 2009
@@ -49,9 +49,9 @@
<bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/${version}</bundle>
</feature>
<feature name="cxf" version="${cxf.version}">
- <bundle>mvn:javax.activation/com.springsource.javax.activation/${spring.javax.activation.version}</bundle>
+ <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:javax.mail/com.springsource.javax.mail/${spring.javax.mail.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>
@@ -92,7 +92,7 @@
</feature>
<feature name="camel" version="${camel.version}">
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
- <bundle>mvn:javax.activation/com.springsource.javax.activation/${spring.javax.activation.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.stax-api-1.0/${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.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb.impl.version}</bundle>
@@ -220,8 +220,8 @@
</feature>
<feature name="servicemix-mail" version="${servicemix-mail-version}">
<feature version="${servicemix-shared-version}">servicemix-shared</feature>
- <bundle>mvn:javax.activation/com.springsource.javax.activation/${spring.javax.activation.version}</bundle>
- <bundle>mvn:javax.mail/com.springsource.javax.mail/${spring.javax.mail.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.bundles/org.apache.servicemix.bundles.javax.mail/${javax.mail.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-mail/${servicemix-mail-version}</bundle>
</feature>
<feature name="servicemix-bean" version="${servicemix-bean-version}">
Modified: servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties?rev=807151&r1=807150&r2=807151&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties (original)
+++ servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/bundles.properties Mon Aug 24 11:24:34 2009
@@ -25,6 +25,7 @@
org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}/jar
org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}/jar
org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}/jar
#Apache Geronimo specs
org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}/jar
@@ -70,6 +71,7 @@
org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache.version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.httpcore/${httpcore.version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax.mail/${javax.mail.version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing.version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.version}/jar
@@ -93,8 +95,6 @@
commons-collections/commons-collections/3.2.1/jar
commons-lang/commons-lang/2.4/jar
commons-pool/commons-pool/1.4/jar
-javax.activation/com.springsource.javax.activation/${spring.javax.activation.version}/jar
-javax.mail/com.springsource.javax.mail/${spring.javax.mail.version}/jar
org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}/jar
org.codehaus.groovy/groovy-all/1.5.6/jar
org.scala-lang/scala-bundle/2.7.2-RC2/jar
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=807151&r1=807150&r2=807151&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Mon Aug 24 11:24:34 2009
@@ -262,14 +262,14 @@
<version>${geronimo.annotation.version}</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>com.springsource.javax.activation</artifactId>
- <version>${spring.javax.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>javax.mail</groupId>
- <artifactId>com.springsource.javax.mail</artifactId>
- <version>${spring.javax.mail.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>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=807151&r1=807150&r2=807151&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java Mon Aug 24 11:24:34 2009
@@ -76,14 +76,12 @@
protected String[] getTestBundlesNames() {
return new String[] {
getBundle("org.apache.felix", "org.apache.felix.prefs"),
- getBundle("javax.activation", "com.springsource.javax.activation"),
+ getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.activation-api-1.1"),
getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"),
- getBundle("javax.mail", "com.springsource.javax.mail"),
getBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-ws-metadata_2.0_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
-
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jbi-api-1.0"),
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.stax-api-1.0"),
@@ -101,6 +99,7 @@
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlsec"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlresolver"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jetty-bundle"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax.mail"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-codec"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.abdera"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jettison"),
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=807151&r1=807150&r2=807151&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Mon Aug 24 11:24:34 2009
@@ -76,9 +76,8 @@
protected String[] getTestBundlesNames() {
return new String[] {
getBundle("org.apache.felix", "org.apache.felix.prefs"),
- getBundle("javax.activation", "com.springsource.javax.activation"),
+ getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.activation-api-1.1"),
getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"),
- getBundle("javax.mail", "com.springsource.javax.mail"),
getBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-ws-metadata_2.0_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
@@ -113,6 +112,7 @@
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlsec"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlresolver"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jetty-bundle"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax.mail"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-codec"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.abdera"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jettison"),
@@ -137,7 +137,7 @@
getBundle("org.apache.servicemix.examples", "cxf-jaxrs"),
getBundle("org.apache.servicemix.examples", "org.apache.servicemix.examples.itests.cxf-nmr-osgi"),
};
- }
+ }
public void testJbiComponent() throws Exception {
Thread.sleep(5000);
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=807151&r1=807150&r2=807151&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Aug 24 11:24:34 2009
@@ -127,6 +127,7 @@
<jaxb.impl.version>2.1.6_1</jaxb.impl.version>
<jaxws.api.version>2.1</jaxws.api.version>
<jaxrs.api.version>1.0</jaxrs.api.version>
+ <javax.mail.version>1.4.1_1-SNAPSHOT</javax.mail.version>
<jcr-api.version>1.0_1</jcr-api.version>
<jdt.core.version>3.2.3_1</jdt.core.version>
<jdom.version>1.1_1</jdom.version>
@@ -205,10 +206,8 @@
<smack.version>3.0.4_1</smack.version>
<snmp4j.version>1.8.1_1</snmp4j.version>
- <spring.javax.activation.version>1.1.1</spring.javax.activation.version>
<spring.version>2.5.6</spring.version>
<spring.integration.version>1.0.0.RC2</spring.integration.version>
- <spring.javax.mail.version>1.4.1</spring.javax.mail.version>
<spring.osgi.version>1.2.0-rc1</spring.osgi.version>
<stringtemplate.version>3.2_1</stringtemplate.version>
<velocity.version>1.6.2_1-SNAPSHOT</velocity.version>