Author: ffang
Date: Sun Nov 2 01:28:30 2008
New Revision: 709851
URL: http://svn.apache.org/viewvc?rev=709851&view=rev
Log:
[SMX4-137]update to camel 1.5
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java
servicemix/smx4/features/trunk/pom.xml
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java?rev=709851&r1=709850&r2=709851&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
Sun Nov 2 01:28:30 2008
@@ -65,10 +65,12 @@
smExchange.setPattern(ExchangePattern.fromWsdlUri(exchange.getPattern().getWsdlUri()));
getAsyncProcessor().process(smExchange);
- if (smExchange.getOut(false) != null) {
+ if (smExchange.getOut(false).getBody() != null) {
exchange.getOut().setBody(smExchange.getOut().getBody());
- } else if (smExchange.getFault(false) != null) {
+ } else if (smExchange.getFault(false).getBody() != null) {
exchange.getFault().setBody(smExchange.getFault().getBody());
+ } else if (smExchange.getException() != null) {
+ throw (Exception)smExchange.getException();
} else {
exchange.setStatus(Status.Done);
}
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java?rev=709851&r1=709850&r2=709851&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixProducer.java
Sun Nov 2 01:28:30 2008
@@ -63,7 +63,9 @@
client.sendSync(e);
if (e.getPattern() != Pattern.InOnly) {
- if (e.getFault().getBody() != null) {
+ if (e.getError() != null) {
+ exchange.setException(e.getError());
+ } else if (e.getFault().getBody() != null) {
exchange.getFault().setBody(e.getFault().getBody());
} else {
exchange.getOut().setBody(e.getOut().getBody());
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java?rev=709851&r1=709850&r2=709851&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
Sun Nov 2 01:28:30 2008
@@ -88,6 +88,7 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
+ errorHandler(noErrorHandler());
from(routerEndpointURI).to("smx:testEndpoint");// like what do
in binding component
from("smx:testEndpoint").to(serviceEndpointURI);// like what do
in se
}
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java?rev=709851&r1=709850&r2=709851&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/addressing/WSAddressingTest.java
Sun Nov 2 01:28:30 2008
@@ -181,6 +181,7 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
+ errorHandler(noErrorHandler());
from("cxf:bean:routerEndpoint").to("smx:testEndpoint");
from("smx:testEndpoint").to("cxf:bean:serviceEndpoint");
}
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java?rev=709851&r1=709850&r2=709851&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ws/policy/WSPolicyTest.java
Sun Nov 2 01:28:30 2008
@@ -89,6 +89,7 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
+ errorHandler(noErrorHandler());
from("cxf:bean:routerEndpoint").to("smx:testEndpoint");
from("smx:testEndpoint").to("cxf:bean:serviceEndpoint");
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=709851&r1=709850&r2=709851&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Sun Nov 2 01:28:30 2008
@@ -73,7 +73,7 @@
<asm.version>2.2.3_1</asm.version>
<bnd.version>0.0.227</bnd.version>
<cglib.version>2.1_3_1</cglib.version>
- <camel.version>1.4.0</camel.version>
+ <camel.version>1.5.0</camel.version>
<commons-beanutils.version>1.7.0_1</commons-beanutils.version>
<commons-csv.version>1.0-r706899_1</commons-csv.version>
<commons-dbcp.version>1.2.2_1</commons-dbcp.version>
