You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/06/05 21:35:35 UTC
svn commit: r663714 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/ camel/bundles/jaxb-impl/
cxf/cxf-transport-nmr/src/main/java/org/apach...
Author: gnodet
Date: Thu Jun 5 12:35:35 2008
New Revision: 663714
URL: http://svn.apache.org/viewvc?rev=663714&view=rev
Log:
SMX4-25: Upgrade to CXF 2.1
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/bundles/jaxb-impl/pom.xml
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java
servicemix/smx4/features/trunk/examples/itests/pom.xml
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=663714&r1=663713&r2=663714&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Jun 5 12:35:35 2008
@@ -194,7 +194,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.1.6</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -204,12 +204,12 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
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=663714&r1=663713&r2=663714&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 Thu Jun 5 12:35:35 2008
@@ -161,9 +161,9 @@
<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.cxf:cxf-bundle</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.0</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl-2.0.3</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.0</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.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>
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=663714&r1=663713&r2=663714&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 Thu Jun 5 12:35:35 2008
@@ -152,9 +152,9 @@
<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.cxf:cxf-bundle</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.0</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl-2.0.3</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.0</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.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>
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=663714&r1=663713&r2=663714&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 Thu Jun 5 12:35:35 2008
@@ -100,12 +100,12 @@
geronimo-ws-metadata_2.0_spec-${geronimo.wsmetadata.version}.jar=50
org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar=50
org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar=50
-org.apache.servicemix.specs.jaxb-api-2.0-${servicemix.specs.version}.jar=50
-org.apache.servicemix.specs.jaxws-api-2.0-${servicemix.specs.version}.jar=50
+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
cxf-bundle-${cxf.version}.jar=50
-org.apache.servicemix.bundles.jaxb-impl-2.0.3-${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
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=663714&r1=663713&r2=663714&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 Jun 5 12:35:35 2008
@@ -69,8 +69,9 @@
<bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.binding.nmr/${version}</bundle>
</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.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.stax-api-1.0/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.0/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl-2.0.3/${version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
Modified: servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml?rev=663714&r1=663713&r2=663714&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml Thu Jun 5 12:35:35 2008
@@ -44,10 +44,11 @@
com.sun.xml.txw2*
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- javax.xml.stream*;resolution:=optional,
com.sun.xml.fastinfoset*;resolution:=optional,
+ javax.xml.stream*;resolution:=optional,
+ org.jvnet.fastinfoset*;resolution:=optional,
org.jvnet.staxex*;resolution:=optional,
- *
+ *
</servicemix.osgi.import.pkg>
</properties>
@@ -77,4 +78,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java?rev=663714&r1=663713&r2=663714&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java Thu Jun 5 12:35:35 2008
@@ -95,7 +95,7 @@
QName interfaceName = new QName(ws.targetNamespace(), ws.name());
QName serviceName;
if (target != null) {
- serviceName = EndpointReferenceUtils.getServiceName(target);
+ serviceName = EndpointReferenceUtils.getServiceName(target, conduit.getBus());
} else {
serviceName = message.getExchange().get(org.apache.cxf.service.Service.class).getName();
}
Modified: servicemix/smx4/features/trunk/examples/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/pom.xml?rev=663714&r1=663713&r2=663714&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/pom.xml Thu Jun 5 12:35:35 2008
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.servicemix.kernel.testing</groupId>
<artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
- <version>${servicemix.kernel.version}</version>
+ <version>${servicemix.kernel.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.1.6</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -272,4 +272,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=663714&r1=663713&r2=663714&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu Jun 5 12:35:35 2008
@@ -69,7 +69,7 @@
<cglib.version>2.1_3</cglib.version>
<camel.version>1.4-SNAPSHOT</camel.version>
<commons.logging.version>1.1</commons.logging.version>
- <cxf.version>2.0.6</cxf.version>
+ <cxf.version>2.1.1-SNAPSHOT</cxf.version>
<felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
<felix.compendium.version>1.0.0</felix.compendium.version>
<felix.configadmin.version>1.0.0</felix.configadmin.version>
@@ -97,8 +97,8 @@
<geronimo.connector.version>2.2-r634076</geronimo.connector.version>
<howl.version>1.0.1-1</howl.version>
<jasper.version>6.0.14</jasper.version>
- <jaxb.api.version>2.0</jaxb.api.version>
- <jaxb.impl.version>2.0.3</jaxb.impl.version>
+ <jaxb.api.version>2.1</jaxb.api.version>
+ <jaxb.impl.version>2.1.6</jaxb.impl.version>
<jaxws.api.version>2.0</jaxws.api.version>
<jencks.version>2.1</jencks.version>
<jetty.version>6.1.9</jetty.version>
@@ -119,7 +119,7 @@
<spring.version>2.5.2</spring.version>
<spring.osgi.version>1.0.2</spring.osgi.version>
<xstream.version>1.2.2</xstream.version>
- <xbean.version>3.3.1-r643297</xbean.version>
+ <xbean.version>3.4.1</xbean.version>
<commons-io.version>1.3.2</commons-io.version>
<commons-jxpath.version>1.2</commons-jxpath.version>
</properties>
@@ -355,6 +355,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>