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:18:10 UTC
svn commit: r729894 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/filtered-resources/
camel/camel-features/src/main/resources/ examples/itests/
examples/itests/src/test/java/org/apache/servicemix/examples/
Author: ffang
Date: Mon Dec 29 06:18:10 2008
New Revision: 729894
URL: http://svn.apache.org/viewvc?rev=729894&view=rev
Log:
[SMX4-183]use servicemix javamail api and activation bundle jar but not geronimo javamail and activation api bundle
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/camel/camel-features/src/main/resources/replacements.properties
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
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=729894&r1=729893&r2=729894&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Dec 29 06:18:10 2008
@@ -53,14 +53,14 @@
<type>tar.gz</type>
</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.components</groupId>
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=729894&r1=729893&r2=729894&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 Dec 29 06:18:10 2008
@@ -56,9 +56,9 @@
<bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/${version}</bundle>
</feature>
<feature name="cxf">
- <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.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.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.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.stax-api-1.0/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
@@ -88,7 +88,7 @@
</feature>
<feature name="camel">
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
- <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.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>
@@ -143,9 +143,9 @@
<feature name="servicemix-cxf-bc">
<feature>servicemix-shared</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
- <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.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.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.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.stax-api-1.0/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
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=729894&r1=729893&r2=729894&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 Dec 29 06:18:10 2008
@@ -25,12 +25,12 @@
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.javamail-api-1.4/${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-activation_1.1_spec/${geronimo.activation.version}/jar
org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}/jar
org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo.el.version}/jar
-org.apache.geronimo.specs/geronimo-javamail_1.4_spec/${geronimo.javamail.version}/jar
org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}/jar
org.apache.geronimo.specs/geronimo-jpa_3.0_spec/${geronimo.jpa.version}/jar
org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}/jar
Modified: servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/replacements.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/replacements.properties?rev=729894&r1=729893&r2=729894&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/replacements.properties (original)
+++ servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/replacements.properties Mon Dec 29 06:18:10 2008
@@ -20,10 +20,10 @@
#specs
javax.xml.bind/jaxb-api/2.1=org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}
javax.xml.stream/stax-api/[1.0,2.0)=org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}
-javax.activation/activation/1.1=org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}
+javax.activation/activation/1.1=org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}
#replace non-osgi versions of the geronimo specs
-!org.apache.geronimo.specs/geronimo-activation_1.0.2_spec/(,1.1]=org.apache.geronimo.specs/geronimo-activation_1.0.2_spec/${geronimo.activation.version}
+!org.apache.geronimo.specs/geronimo-activation_1.0.2_spec/(,1.1]=org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}
org.apache.geronimo.specs/geronimo-jms_1.1_spec/(,1.1]=org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}
#bundles
Modified: servicemix/smx4/features/trunk/examples/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/pom.xml?rev=729894&r1=729893&r2=729894&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/pom.xml Mon Dec 29 06:18:10 2008
@@ -252,19 +252,19 @@
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>${geronimo.activation.version}</version>
- </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.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
<version>${geronimo.annotation.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/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=729894&r1=729893&r2=729894&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 Mon Dec 29 06:18:10 2008
@@ -74,9 +74,9 @@
protected String[] getTestBundlesNames() {
return new String[] {
getBundle("org.apache.felix", "org.apache.felix.prefs"),
- getBundle("org.apache.geronimo.specs", "geronimo-activation_1.1_spec"),
+ getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.activation-api-1.1"),
getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"),
- getBundle("org.apache.geronimo.specs", "geronimo-javamail_1.4_spec"),
+ getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.javamail-api-1.4"),
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"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=729894&r1=729893&r2=729894&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Dec 29 06:18:10 2008
@@ -98,13 +98,11 @@
<felix.plugin.version>1.4.1</felix.plugin.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
<flatpack.version>3.1.1_1</flatpack.version>
- <geronimo.activation.version>1.0.2</geronimo.activation.version>
<geronimo.annotation.version>1.1.1</geronimo.annotation.version>
<geronimo.ejb3.version>1.0.1</geronimo.ejb3.version>
<geronimo.el.version>1.0.1</geronimo.el.version>
<geronimo.interceptor.version>1.0.1</geronimo.interceptor.version>
<geronimo.jacc.version>1.0.1</geronimo.jacc.version>
- <geronimo.javamail.version>1.5</geronimo.javamail.version>
<geronimo.jaxrpc.version>2.0.0</geronimo.jaxrpc.version>
<geronimo.j2ee.connector.version>2.0.0</geronimo.j2ee.connector.version>
<geronimo.j2ee.management.version>1.0.1</geronimo.j2ee.management.version>