[servicemix-scm] auto-default the operation name on the message exchange from the ActivationSpec

[jstrachan]

Commit in servicemix/base/src/main/java/org/servicemix/jbi/messaging on MAIN
DeliveryChannelImpl.java	+1	-1	1.16 -> 1.17
MessageExchangeFactoryImpl.java	+5	-1	1.7 -> 1.8
	+6	-2

2 modified files

auto-default the operation name on the message exchange from the ActivationSpec

---

servicemix/base/src/main/java/org/servicemix/jbi/messaging

DeliveryChannelImpl.java 1.16 -> 1.17

diff -u -r1.16 -r1.17
--- DeliveryChannelImpl.java	27 Jul 2005 07:35:20 -0000	1.16
+++ DeliveryChannelImpl.java	2 Aug 2005 17:10:09 -0000	1.17
@@ -41,7 +41,7 @@

 /**
  * DeliveryChannel implementation
  * 

- * @version $Revision: 1.16 $

+ * @version $Revision: 1.17 $

  */
 public class DeliveryChannelImpl implements DeliveryChannel {
     private static final Log log = LogFactory.getLog(DeliveryChannel.class);

---

servicemix/base/src/main/java/org/servicemix/jbi/messaging

MessageExchangeFactoryImpl.java 1.7 -> 1.8

diff -u -r1.7 -r1.8
--- MessageExchangeFactoryImpl.java	27 Jul 2005 07:35:20 -0000	1.7
+++ MessageExchangeFactoryImpl.java	2 Aug 2005 17:10:09 -0000	1.8
@@ -37,7 +37,7 @@

 /**
  * Resolver for URI patterns
  *

- * @version $Revision: 1.7 $

+ * @version $Revision: 1.8 $

  */
 public class MessageExchangeFactoryImpl implements MessageExchangeFactory {
 

@@ -210,6 +210,10 @@

     protected void setDefaults(MessageExchangeImpl exchange) {
         exchange.setService(serviceName);
         exchange.setInterfaceName(getInterfaceName());

+        ActivationSpec activationSpec = context.getActivationSpec();
+        if (activationSpec != null) {
+            exchange.setOperation(activationSpec.getDestinationOperation());
+        }

         exchange.setEndpoint(getEndpoint());
         exchange.setSourceContext(getContext());
         Marshaler marshaler = getContext().getActivationSpec().getMarshaler();

CVSspam 0.2.8