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 2006/03/30 20:28:22 UTC
svn commit: r390206 - in /incubator/servicemix/trunk:
servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java
Author: gnodet
Date: Thu Mar 30 10:28:20 2006
New Revision: 390206
URL: http://svn.apache.org/viewcvs?rev=390206&view=rev
Log:
When targetService is specified but not targetEndpoint, the wsdl is not retrieved from the proxied endpoint.
Modified:
incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java
Modified: incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java?rev=390206&r1=390205&r2=390206&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java (original)
+++ incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java Thu Mar 30 10:28:20 2006
@@ -76,6 +76,12 @@
if (targetService != null && targetEndpoint != null) {
svc = def.getService(targetService);
port = (svc != null) ? svc.getPort(targetEndpoint) : null;
+ } else if (targetService != null) {
+ svc = def.getService(targetService);
+ if (svc != null) {
+ Iterator it = svc.getPorts().values().iterator();
+ port = (it.hasNext()) ? (Port) it.next() : null;
+ }
} else if (targetInterfaceName != null) {
Iterator it = def.getServices().values().iterator();
svc = it .hasNext() ? (Service) it.next() : null;
Modified: incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java?rev=390206&r1=390205&r2=390206&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java (original)
+++ incubator/servicemix/trunk/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java Thu Mar 30 10:28:20 2006
@@ -171,6 +171,12 @@
if (targetService != null && targetEndpoint != null) {
svc = def.getService(targetService);
port = (svc != null) ? svc.getPort(targetEndpoint) : null;
+ } else if (targetService != null) {
+ svc = def.getService(targetService);
+ if (svc != null) {
+ Iterator it = svc.getPorts().values().iterator();
+ port = (it.hasNext()) ? (Port) it.next() : null;
+ }
} else if (targetInterfaceName != null) {
Iterator it = def.getServices().values().iterator();
svc = it .hasNext() ? (Service) it.next() : null;