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/06/30 19:38:36 UTC
svn commit: r418341 - in /incubator/servicemix/trunk/servicemix-core/src:
main/java/org/apache/servicemix/client/
test/java/org/apache/servicemix/client/
Author: jstrachan
Date: Fri Jun 30 10:38:35 2006
New Revision: 418341
URL: http://svn.apache.org/viewvc?rev=418341&view=rev
Log:
added a simpler to use API for one-way messaging hiding the InOnly exchange class
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultDestination.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/Destination.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-core/src/test/java/org/apache/servicemix/client/ClientDestinationTest.java
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultDestination.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultDestination.java?rev=418341&r1=418340&r2=418341&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultDestination.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultDestination.java Fri Jun 30 10:38:35 2006
@@ -75,10 +75,15 @@
return answer;
}
+ public Message createInOnlyMessage() throws MessagingException {
+ return (Message) createInOnlyExchange().getInMessage();
+ }
+
protected void configure(MessageExchange exchange) throws MessagingException {
if (endpoint == null) {
endpoint = resolveEndpoint(client, destinationUri);
}
exchange.setEndpoint(endpoint);
}
+
}
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?rev=418341&r1=418340&r2=418341&view=diff
==============================================================================
--- 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 Fri Jun 30 10:38:35 2006
@@ -138,6 +138,10 @@
public void send(MessageExchange exchange) throws MessagingException {
getDeliveryChannel().send(exchange);
}
+
+ public void send(Message message) throws MessagingException {
+ send(message.getExchange());
+ }
public boolean sendSync(MessageExchange exchange) throws MessagingException {
return getDeliveryChannel().sendSync(exchange);
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/Destination.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/Destination.java?rev=418341&r1=418340&r2=418341&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/Destination.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/client/Destination.java Fri Jun 30 10:38:35 2006
@@ -61,4 +61,10 @@
*/
RobustInOnly createRobustInOnlyExchange() throws MessagingException;
+ /**
+ * Allows a Message to be created for an {@link InOnly} exchange for simpler one-way messaging.
+ * @throws MessagingException
+ */
+ Message createInOnlyMessage() throws MessagingException;
+
}
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?rev=418341&r1=418340&r2=418341&view=diff
==============================================================================
--- 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 Fri Jun 30 10:38:35 2006
@@ -58,6 +58,13 @@
void send(MessageExchange exchange) throws MessagingException;
/**
+ * Sends an In-Only message
+ *
+ * @param message
+ */
+ void send(Message message) throws MessagingException;
+
+ /**
* Sends the message exchange to the endpoint, blocking until the send has completed.
*
* @param exchange
@@ -341,5 +348,6 @@
* @throws MessagingException
*/
MessageExchangeFactory getExchangeFactory() throws MessagingException;
+
}
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?rev=418341&r1=418340&r2=418341&view=diff
==============================================================================
--- 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 Fri Jun 30 10:38:35 2006
@@ -144,6 +144,10 @@
getDeliveryChannel().send(exchange);
done(exchange);
}
+
+ public void send(Message message) throws MessagingException {
+ send(message.getExchange());
+ }
public boolean sendSync(MessageExchange exchange) throws MessagingException {
return getDeliveryChannel().sendSync(exchange);
Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ClientDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ClientDestinationTest.java?rev=418341&r1=418340&r2=418341&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ClientDestinationTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ClientDestinationTest.java Fri Jun 30 10:38:35 2006
@@ -44,13 +44,21 @@
protected AbstractXmlApplicationContext context;
protected ServiceMixClient client;
protected MessageList messageList = new MessageList();
- protected Destination inOnlyDestination;
- protected Destination inOutDestination;
- protected String inOnlyUri = "service:http://servicemix.org/cheese/receiver";
- protected String inOutUri = "service:http://servicemix.org/cheese/myService";
- public void testSendUsingInOnlyExchange() throws Exception {
- InOnly exchange = inOnlyDestination.createInOnlyExchange();
+ public void testInOnlyMessage() throws Exception {
+ Destination destination = client.createDestination("service:http://servicemix.org/cheese/receiver");
+ Message message = destination.createInOnlyMessage();
+ message.setProperty("name", "James");
+ message.setBody("<hello>world</hello>");
+
+ client.send(message);
+
+ messageList.assertMessagesReceived(1);
+ }
+
+ public void testInOnlyExchange() throws Exception {
+ Destination destination = client.createDestination("service:http://servicemix.org/cheese/receiver");
+ InOnly exchange = destination.createInOnlyExchange();
NormalizedMessage message = exchange.getInMessage();
message.setProperty("name", "James");
@@ -61,8 +69,9 @@
messageList.assertMessagesReceived(1);
}
- public void testRequestResponse() throws Exception {
- InOut exchange = inOutDestination.createInOutExchange();
+ public void testInOutExchange() throws Exception {
+ Destination destination = client.createDestination("service:http://servicemix.org/cheese/myService");
+ InOut exchange = destination.createInOutExchange();
NormalizedMessage request = exchange.getInMessage();
request.setProperty("name", "James");
@@ -118,10 +127,6 @@
protected void setUp() throws Exception {
context = createBeanFactory();
client = (ServiceMixClient) getBean("client");
-
- inOnlyDestination = client.createDestination(inOnlyUri);
- inOutDestination = client.createDestination(inOutUri);
-
messageList = createMessageList();
}