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 2009/03/20 04:04:04 UTC
svn commit: r756316 - in /servicemix/smx4/features/trunk:
cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java
examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
Author: ffang
Date: Fri Mar 20 03:04:03 2009
New Revision: 756316
URL: http://svn.apache.org/viewvc?rev=756316&view=rev
Log:
[SMX4-135]The CXF NMR transport does not use the given URI to identify the NMR endpoint
Modified:
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java
servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
Modified: servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java?rev=756316&r1=756315&r2=756316&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java (original)
+++ servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java Fri Mar 20 03:04:03 2009
@@ -57,7 +57,13 @@
super(getTargetReference(info, null), info);
this.nmr = nmr;
this.properties = new HashMap<String, Object>();
- this.properties.put(Endpoint.NAME, info.getName().toString());
+ String address = info.getAddress();
+ if (address != null && address.startsWith("nmr:")) {
+ this.properties.put(Endpoint.NAME, address.substring(4, info.getAddress().length()));
+ } else {
+ this.properties.put(Endpoint.NAME, info.getName().toString());
+ }
+
this.properties.put(Endpoint.SERVICE_NAME, info.getService().getName().toString());
this.properties.put(Endpoint.INTERFACE_NAME, info.getInterface().getName().toString());
}
Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml?rev=756316&r1=756315&r2=756316&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/src/main/resources/META-INF/spring/beans.xml Fri Mar 20 03:04:03 2009
@@ -40,7 +40,7 @@
<route>
<from uri="timer://myTimer?fixedRate=true&period=5000&exchangePattern=InOut" />
<bean ref="myTransform" method="transform"/>
- <to uri="nmr:{http://cxfcamel.examples.servicemix.apache.org/}HelloWorldImplPort"/>
+ <to uri="nmr:HelloWorld"/>
<bean ref="myTransform" method="display" />
</route>
</camel-osgi:camelContext>