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/06/11 10:39:51 UTC
svn commit: r666569 - in /servicemix/smx4/features/trunk: ./
assembly/src/main/filtered-resources/ camel/bundles/jaxb-impl/
camel/servicemix-camel/
camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/
examples/itests/ examples/itests/src/t...
Author: ffang
Date: Wed Jun 11 01:39:51 2008
New Revision: 666569
URL: http://svn.apache.org/viewvc?rev=666569&view=rev
Log:
[SMX4-26]update jaxb and jaxws version since we now use cxf 2.1 in servicemix4
Modified:
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/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
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/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=666569&r1=666568&r2=666569&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 Wed Jun 11 01:39:51 2008
@@ -45,10 +45,10 @@
<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>
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.0/${servicemix.specs.version}</bundle>
- <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.0/${servicemix.specs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm-2.2.3/${servicemix.kernel.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl-2.0.3/${version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl-2.1.6/${version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.neethi-2.0.2/${version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox-3.2.3/${servicemix.nmr.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1/${version}</bundle>
@@ -72,8 +72,8 @@
<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.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl-2.1.6/${version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core/${camel.version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring/${camel.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=666569&r1=666568&r2=666569&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml Wed Jun 11 01:39:51 2008
@@ -67,7 +67,7 @@
</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-${jaxb.api.version}</artifactId>
<version>${servicemix.specs.version}</version>
<optional>true</optional>
</dependency>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=666569&r1=666568&r2=666569&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Wed Jun 11 01:39:51 2008
@@ -147,6 +147,16 @@
<version>136</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xfire</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>1.0.1</version>
+ </dependency>
</dependencies>
<build>
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java?rev=666569&r1=666568&r2=666569&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/ServiceMixConsumer.java Wed Jun 11 01:39:51 2008
@@ -64,13 +64,7 @@
ServiceMixExchange smExchange = getEndpoint().createExchange(exchange.getIn(), exchange);
smExchange.setPattern(ExchangePattern.fromWsdlUri(exchange.getPattern().getWsdlUri()));
getAsyncProcessor().process(smExchange);
- /*if (smExchange.getFault(false) != null) {
- exchange.getFault().setBody(smExchange.getFault().getBody());
- } else if (smExchange.getOut(false) != null) {
- exchange.getOut().setBody(smExchange.getOut().getBody());
- } else {
- exchange.setStatus(Status.Done);
- }*/
+
if (smExchange.getOut(false) != null) {
exchange.getOut().setBody(smExchange.getOut().getBody());
} else if (smExchange.getFault(false) != null) {
Modified: servicemix/smx4/features/trunk/examples/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/pom.xml?rev=666569&r1=666568&r2=666569&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/pom.xml Wed Jun 11 01:39:51 2008
@@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.1.6</artifactId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl-${jaxb.impl.version}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -186,12 +186,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-${jaxb.api.version}</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-${jaxws.api.version}</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
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=666569&r1=666568&r2=666569&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 Wed Jun 11 01:39:51 2008
@@ -63,10 +63,10 @@
getBundle("org.apache.geronimo.specs", "geronimo-ws-metadata_2.0_spec"),
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.stax-api-1.0"),
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.saaj-api-1.3"),
- getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxb-api-2.0"),
- getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxws-api-2.0"),
+ getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxb-api-2.1"),
+ getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxws-api-2.1"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.asm-2.2.3"),
- getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl-2.0.3"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl-2.1.6"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.neethi-2.0.2"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.woodstox-3.2.3"),
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j-1.6.1"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=666569&r1=666568&r2=666569&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Jun 11 01:39:51 2008
@@ -99,7 +99,7 @@
<jasper.version>6.0.14</jasper.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>
+ <jaxws.api.version>2.1</jaxws.api.version>
<jencks.version>2.1</jencks.version>
<jetty.version>6.1.9</jetty.version>
<jline.version>0.9.93</jline.version>
@@ -291,6 +291,11 @@
<version>${geronimo.j2ee.connector.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<version>${geronimo.j2ee.management.version}</version>