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 2010/03/13 09:02:52 UTC
svn commit: r922495 - in
/servicemix/components/bindings/servicemix-cxf-bc/trunk: pom.xml
src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
Author: ffang
Date: Sat Mar 13 08:02:51 2010
New Revision: 922495
URL: http://svn.apache.org/viewvc?rev=922495&view=rev
Log:
[SMXCOMP-726]HTTP_DESTINATION_URI doesn't work anymore for cxf bc provider
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml?rev=922495&r1=922494&r2=922495&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml Sat Mar 13 08:02:51 2010
@@ -44,7 +44,7 @@
</scm>
<properties>
- <servicemix-cxf-se-version>2010.01</servicemix-cxf-se-version>
+ <servicemix-cxf-se-version>2010.02-SNAPSHOT</servicemix-cxf-se-version>
<cxf-version>2.2.6</cxf-version>
<activemq-version>5.3.0</activemq-version>
<jetty-version>6.1.22</jetty-version>
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java?rev=922495&r1=922494&r2=922495&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java Sat Mar 13 08:02:51 2010
@@ -168,11 +168,13 @@ public class CxfBcProvider extends Provi
NormalizedMessage nm = exchange.getMessage("in");
Object newDestinationURI = nm.getProperty(JbiConstants.HTTP_DESTINATION_URI);
+
+
+ Message message = ep.getBinding().createMessage();
if (newDestinationURI != null) {
ei.setAddress((String) newDestinationURI);
+ message.put(Message.ENDPOINT_ADDRESS, newDestinationURI);
}
-
- Message message = ep.getBinding().createMessage();
message.put(MessageExchange.class, exchange);
Exchange cxfExchange = new ExchangeImpl();
cxfExchange.setConduit(conduit);
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java?rev=922495&r1=922494&r2=922495&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java Sat Mar 13 08:02:51 2010
@@ -217,6 +217,27 @@ public class CxfBCSEProviderSystemTest e
client.done(io);
assertTrue(txt.indexOf("Hello Edell") >= 0);
+ if (useDynamicUri) {
+ //the second round use dummy uri to verify the dynamic uri could be overriden for each message
+ io = client.createInOutExchange();
+ io.setService(new QName("http://apache.org/hello_world_soap_http_provider", "SOAPService"));
+ io.setInterfaceName(new QName("http://apache.org/hello_world_soap_http_provider", "Greeter"));
+ io.getInMessage()
+ .setContent(
+ new StringSource(
+ "<greetMe xmlns='http://apache.org/hello_world_soap_http_provider/types'><requestType>"
+ + "ffang"
+ + "</requestType></greetMe>"));
+ if (useDynamicUri) {
+ io.getInMessage().setProperty(
+ JbiConstants.HTTP_DESTINATION_URI,
+ "http://localhost:9003/dynamicuritest");
+ }
+ client.sendSync(io);
+ // the out message should be null as the server not exist at all
+ assertNull(io.getOutMessage());
+ }
+
}
private void greetMeProviderWithoutOperationNameTestBase() throws Exception {