Tidy jms policy implementations to remove code from the binding and put it into binding wire interceptors. The implication is that the JMS runtime no longer depends on the JMS policy package. Also get rid of split packages in wire format and operation selector packages. Add a binding context to the Tuscany message so that you don't have to keep finding it in the message header.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@721811 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 11 deletions

diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
index 9c5fba5de6..39f79dd70d 100644
--- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
+++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
@@ -35,16 +35,12 @@ import javax.security.auth.Subject;
 import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
 import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
 import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy;
-import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.invocation.DataExchangeSemantics;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.policy.PolicySet;
 import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.apache.tuscany.sca.policy.authentication.token.TokenPrincipal;
 import org.apache.tuscany.sca.runtime.ReferenceParameters;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
@@ -67,8 +63,8 @@ public class JMSBindingInvoker implements Invoker, DataExchangeSemantics {
     protected Destination bindingRequestDest;
     protected Destination bindingReplyDest;
     protected RuntimeComponentReference reference;
-    protected JMSTokenAuthenticationPolicy jmsTokenAuthenticationPolicy = null;
-    protected JMSHeaderPolicy jmsHeaderPolicy = null;
+    //protected JMSTokenAuthenticationPolicy jmsTokenAuthenticationPolicy = null;
+    //protected JMSHeaderPolicy jmsHeaderPolicy = null;
 
     public JMSBindingInvoker(JMSBinding jmsBinding, Operation operation, JMSResourceFactory jmsResourceFactory, RuntimeComponentReference reference) {
 
@@ -82,6 +78,7 @@ public class JMSBindingInvoker implements Invoker, DataExchangeSemantics {
         this.responseMessageProcessor = JMSMessageProcessorUtil.getResponseMessageProcessor(jmsBinding);
 
         // find out which policies are active
+/*        
         if (jmsBinding instanceof PolicySetAttachPoint) {
             List<PolicySet> policySets = ((PolicySetAttachPoint)jmsBinding).getApplicablePolicySets();
             for (PolicySet ps : policySets) {
@@ -96,6 +93,7 @@ public class JMSBindingInvoker implements Invoker, DataExchangeSemantics {
                 }
             }
         }
+*/        
         
         try {
 
@@ -327,7 +325,7 @@ public class JMSBindingInvoker implements Invoker, DataExchangeSemantics {
     protected void setHeaders(org.apache.tuscany.sca.invocation.Message tuscanyMsg, Message jmsMsg) throws JMSException {
 
         requestMessageProcessor.setOperationName(jmsBinding.getNativeOperationName(operationName), jmsMsg);
-
+/*
         if ((jmsHeaderPolicy != null) && 
             (jmsHeaderPolicy.getDeliveryModePersistent() != null)) {
             if (jmsHeaderPolicy.getDeliveryModePersistent()) {
@@ -383,12 +381,14 @@ public class JMSBindingInvoker implements Invoker, DataExchangeSemantics {
                 jmsMsg.setStringProperty(JMSBindingConstants.CALLBACK_Q_PROPERTY, callbackDestName);
             }
         }
-        
+
+
         if (jmsHeaderPolicy != null){
             for (String propName : jmsHeaderPolicy.getProperties().keySet()) {
                 jmsMsg.setObjectProperty(propName, jmsHeaderPolicy.getProperties().get(propName));
             }
         }
+*/        
         
         for (String propName : jmsBinding.getPropertyNames()) {
             Object value = jmsBinding.getProperty(propName);
@@ -402,7 +402,7 @@ public class JMSBindingInvoker implements Invoker, DataExchangeSemantics {
                 jmsMsg.setObjectProperty(propName, value);
             }
         }
-        
+/*        
         if (jmsTokenAuthenticationPolicy != null) {
             Subject subject = SecurityUtil.getSubject(tuscanyMsg);
             TokenPrincipal principal = SecurityUtil.getPrincipal(subject, TokenPrincipal.class);
@@ -410,6 +410,7 @@ public class JMSBindingInvoker implements Invoker, DataExchangeSemantics {
                 jmsMsg.setStringProperty(jmsTokenAuthenticationPolicy.getTokenName().toString(), principal.getName());
             }
         }
+*/        
     }
 
     protected boolean hasCallback() {
@@ -427,10 +428,10 @@ public class JMSBindingInvoker implements Invoker, DataExchangeSemantics {
         MessageConsumer consumer = session.createConsumer(replyToDest, msgSelector);
       
         long receiveWait;
-        if ((jmsHeaderPolicy != null) && 
+       /* if ((jmsHeaderPolicy != null) && 
             (jmsHeaderPolicy.getTimeToLive() != null)) {
             receiveWait = jmsHeaderPolicy.getTimeToLive();
-        } else if (jmsBinding.getOperationJMSTimeToLive(operationName) != null) {
+        } else */if (jmsBinding.getOperationJMSTimeToLive(operationName) != null) {
             receiveWait = jmsBinding.getOperationJMSTimeToLive(operationName) * 2;        
         } else {
             receiveWait = JMSBindingConstants.DEFAULT_TIME_TO_LIVE;