You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by js...@apache.org on 2006/10/09 11:52:57 UTC
svn commit: r454324 - in /incubator/servicemix/trunk:
servicemix-bean/src/test/java/org/apache/servicemix/bean/
servicemix-core/src/main/java/org/apache/servicemix/client/
servicemix-file/src/test/java/org/apache/servicemix/file/
servicemix-ftp/src/tes...
Author: jstrachan
Date: Mon Oct 9 02:52:56 2006
New Revision: 454324
URL: http://svn.apache.org/viewvc?view=rev&rev=454324
Log:
added a new helper method on the ServiceMixClient API to make it a little easier to lookup endpoint references
Modified:
incubator/servicemix/trunk/servicemix-bean/src/test/java/org/apache/servicemix/bean/DynamicEndpointTest.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultServiceMixClient.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClient.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClientFacade.java
incubator/servicemix/trunk/servicemix-file/src/test/java/org/apache/servicemix/file/DynamicEndpointTest.java
incubator/servicemix/trunk/servicemix-ftp/src/test/java/org/apache/servicemix/ftp/DynamicEndpointTest.java
incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/apache/servicemix/jabber/DynamicEndpointTest.java
Modified: incubator/servicemix/trunk/servicemix-bean/src/test/java/org/apache/servicemix/bean/DynamicEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-bean/src/test/java/org/apache/servicemix/bean/DynamicEndpointTest.java?view=diff&rev=454324&r1=454323&r2=454324
==============================================================================
--- incubator/servicemix/trunk/servicemix-bean/src/test/java/org/apache/servicemix/bean/DynamicEndpointTest.java (original)
+++ incubator/servicemix/trunk/servicemix-bean/src/test/java/org/apache/servicemix/bean/DynamicEndpointTest.java Mon Oct 9 02:52:56 2006
@@ -16,15 +16,14 @@
*/
package org.apache.servicemix.bean;
+import org.apache.servicemix.bean.beans.ListenerBean;
import org.apache.servicemix.client.DefaultServiceMixClient;
+import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.jbi.resolver.URIResolver;
-import org.apache.servicemix.bean.beans.ListenerBean;
import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.w3c.dom.DocumentFragment;
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOnly;
@@ -44,11 +43,9 @@
}
protected ListenerBean assertInvokeListenerBean(String uri) throws Exception {
- // now lets make a request on this endpoint
- DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
+ ServiceMixClient client = new DefaultServiceMixClient(jbi);
- DocumentFragment epr = URIResolver.createWSAEPR(uri);
- ServiceEndpoint se = client.getContext().resolveEndpointReference(epr);
+ ServiceEndpoint se = client.resolveEndpointReference(uri);
assertNotNull("We should find a service endpoint!", se);
InOnly exchange = client.createInOnlyExchange();
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultServiceMixClient.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultServiceMixClient.java?view=diff&rev=454324&r1=454323&r2=454324
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultServiceMixClient.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultServiceMixClient.java Mon Oct 9 02:52:56 2006
@@ -23,16 +23,11 @@
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
import org.apache.servicemix.jbi.messaging.PojoMarshaler;
-import org.apache.servicemix.jbi.resolver.EndpointFilter;
-import org.apache.servicemix.jbi.resolver.EndpointResolver;
-import org.apache.servicemix.jbi.resolver.ExternalInterfaceNameEndpointResolver;
-import org.apache.servicemix.jbi.resolver.ExternalServiceNameEndpointResolver;
-import org.apache.servicemix.jbi.resolver.InterfaceNameEndpointResolver;
-import org.apache.servicemix.jbi.resolver.NullEndpointFilter;
-import org.apache.servicemix.jbi.resolver.ServiceAndEndpointNameResolver;
-import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
+import org.apache.servicemix.jbi.resolver.*;
+import org.w3c.dom.DocumentFragment;
import javax.jbi.JBIException;
+import javax.jbi.servicedesc.ServiceEndpoint;
import javax.jbi.component.ComponentContext;
import javax.jbi.messaging.DeliveryChannel;
import javax.jbi.messaging.Fault;
@@ -235,6 +230,15 @@
throw new NoOutMessageAvailableException(exchange);
}
return getMarshaler().unmarshal(exchange, outMessage);
+ }
+
+ /**
+ * Resolves a WS-Addressing endpoint reference String into a JBI {@link ServiceEndpoint}
+ * reference so that message exchanges can be directed to an endpoint
+ */
+ public ServiceEndpoint resolveEndpointReference(String uri) {
+ DocumentFragment epr = URIResolver.createWSAEPR(uri);
+ return getContext().resolveEndpointReference(epr);
}
public EndpointResolver createResolverForService(QName service) {
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClient.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClient.java?view=diff&rev=454324&r1=454323&r2=454324
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClient.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClient.java Mon Oct 9 02:52:56 2006
@@ -16,23 +16,14 @@
*/
package org.apache.servicemix.client;
-import java.util.Map;
+import org.apache.servicemix.jbi.resolver.EndpointResolver;
import javax.jbi.JBIException;
+import javax.jbi.servicedesc.ServiceEndpoint;
import javax.jbi.component.ComponentContext;
-import javax.jbi.messaging.DeliveryChannel;
-import javax.jbi.messaging.ExchangeStatus;
-import javax.jbi.messaging.Fault;
-import javax.jbi.messaging.InOnly;
-import javax.jbi.messaging.InOptionalOut;
-import javax.jbi.messaging.InOut;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessageExchangeFactory;
-import javax.jbi.messaging.MessagingException;
-import javax.jbi.messaging.RobustInOnly;
+import javax.jbi.messaging.*;
import javax.xml.namespace.QName;
-
-import org.apache.servicemix.jbi.resolver.EndpointResolver;
+import java.util.Map;
/**
* Represents a client API which allows users to programatically send messages into the JBI
@@ -243,6 +234,16 @@
+
+ /**
+ * Resolves a WS-Addressing endpoint reference String into a JBI {@link javax.jbi.servicedesc.ServiceEndpoint}
+ * reference so that message exchanges can be directed to an endpoint
+ *
+ * @param uri the WS-Addressing endpoint reference string
+ */
+ ServiceEndpoint resolveEndpointReference(String uri);
+
+
// Helper methods to get an endpoint resolver
//-------------------------------------------------------------------------
@@ -354,4 +355,6 @@
* @throws JBIException
*/
void close() throws JBIException;
+
+
}
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClientFacade.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClientFacade.java?view=diff&rev=454324&r1=454323&r2=454324
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClientFacade.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClientFacade.java Mon Oct 9 02:52:56 2006
@@ -23,16 +23,11 @@
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
import org.apache.servicemix.jbi.messaging.PojoMarshaler;
-import org.apache.servicemix.jbi.resolver.EndpointFilter;
-import org.apache.servicemix.jbi.resolver.EndpointResolver;
-import org.apache.servicemix.jbi.resolver.ExternalInterfaceNameEndpointResolver;
-import org.apache.servicemix.jbi.resolver.ExternalServiceNameEndpointResolver;
-import org.apache.servicemix.jbi.resolver.InterfaceNameEndpointResolver;
-import org.apache.servicemix.jbi.resolver.NullEndpointFilter;
-import org.apache.servicemix.jbi.resolver.ServiceAndEndpointNameResolver;
-import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
+import org.apache.servicemix.jbi.resolver.*;
+import org.w3c.dom.DocumentFragment;
import javax.jbi.JBIException;
+import javax.jbi.servicedesc.ServiceEndpoint;
import javax.jbi.component.ComponentContext;
import javax.jbi.messaging.DeliveryChannel;
import javax.jbi.messaging.ExchangeStatus;
@@ -268,6 +263,11 @@
throw new NoOutMessageAvailableException(exchange);
}
return getMarshaler().unmarshal(exchange, outMessage);
+ }
+
+ public ServiceEndpoint resolveEndpointReference(String uri) {
+ DocumentFragment epr = URIResolver.createWSAEPR(uri);
+ return getContext().resolveEndpointReference(epr);
}
public EndpointResolver createResolverForService(QName service) {
Modified: incubator/servicemix/trunk/servicemix-file/src/test/java/org/apache/servicemix/file/DynamicEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-file/src/test/java/org/apache/servicemix/file/DynamicEndpointTest.java?view=diff&rev=454324&r1=454323&r2=454324
==============================================================================
--- incubator/servicemix/trunk/servicemix-file/src/test/java/org/apache/servicemix/file/DynamicEndpointTest.java (original)
+++ incubator/servicemix/trunk/servicemix-file/src/test/java/org/apache/servicemix/file/DynamicEndpointTest.java Mon Oct 9 02:52:56 2006
@@ -18,13 +18,12 @@
package org.apache.servicemix.file;
import org.apache.servicemix.client.DefaultServiceMixClient;
+import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.jbi.resolver.URIResolver;
import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.w3c.dom.DocumentFragment;
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOnly;
@@ -41,11 +40,9 @@
}
public void testSendingToDynamicEndpoint() throws Exception {
- // now lets make a request on this endpoint
- DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
+ ServiceMixClient client = new DefaultServiceMixClient(jbi);
- DocumentFragment epr = URIResolver.createWSAEPR(dynamicURI);
- ServiceEndpoint se = client.getContext().resolveEndpointReference(epr);
+ ServiceEndpoint se = client.resolveEndpointReference(dynamicURI);
assertNotNull("We should find a service endpoint!", se);
InOnly exchange = client.createInOnlyExchange();
Modified: incubator/servicemix/trunk/servicemix-ftp/src/test/java/org/apache/servicemix/ftp/DynamicEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-ftp/src/test/java/org/apache/servicemix/ftp/DynamicEndpointTest.java?view=diff&rev=454324&r1=454323&r2=454324
==============================================================================
--- incubator/servicemix/trunk/servicemix-ftp/src/test/java/org/apache/servicemix/ftp/DynamicEndpointTest.java (original)
+++ incubator/servicemix/trunk/servicemix-ftp/src/test/java/org/apache/servicemix/ftp/DynamicEndpointTest.java Mon Oct 9 02:52:56 2006
@@ -16,28 +16,25 @@
*/
package org.apache.servicemix.ftp;
-import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.servicemix.client.DefaultServiceMixClient;
-import org.apache.servicemix.jbi.resolver.URIResolver;
-import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
-import org.w3c.dom.DocumentFragment;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import javax.jbi.servicedesc.ServiceEndpoint;
+import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.servicedesc.ServiceEndpoint;
public class DynamicEndpointTest extends SpringTestSupport {
public void testSendingToDynamicEndpoint() throws Exception {
- // now lets make a request on this endpoint
- DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
+ ServiceMixClient client = new DefaultServiceMixClient(jbi);
- DocumentFragment epr = URIResolver.createWSAEPR("ftp://host/path");
- ServiceEndpoint se = client.getContext().resolveEndpointReference(epr);
+ ServiceEndpoint se = client.resolveEndpointReference("ftp://host/path");
assertNotNull("We should find a service endpoint!", se);
InOnly exchange = client.createInOnlyExchange();
Modified: incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/apache/servicemix/jabber/DynamicEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/apache/servicemix/jabber/DynamicEndpointTest.java?view=diff&rev=454324&r1=454323&r2=454324
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/apache/servicemix/jabber/DynamicEndpointTest.java (original)
+++ incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/apache/servicemix/jabber/DynamicEndpointTest.java Mon Oct 9 02:52:56 2006
@@ -17,13 +17,12 @@
package org.apache.servicemix.jabber;
import org.apache.servicemix.client.DefaultServiceMixClient;
+import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.jbi.resolver.URIResolver;
import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.w3c.dom.DocumentFragment;
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOnly;
@@ -33,11 +32,9 @@
public class DynamicEndpointTest extends SpringTestSupport {
public void testSendingToDynamicEndpoint() throws Exception {
- // now lets make a request on this endpoint
- DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
+ ServiceMixClient client = new DefaultServiceMixClient(jbi);
- DocumentFragment epr = URIResolver.createWSAEPR("jabber://im.google.com/room");
- ServiceEndpoint se = client.getContext().resolveEndpointReference(epr);
+ ServiceEndpoint se = client.resolveEndpointReference("jabber://im.google.com/room");
assertNotNull("We should find a service endpoint!", se);
InOnly exchange = client.createInOnlyExchange();