Providing phase value for the interceptor

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

4 files changed, 12 insertions, 7 deletions

diff --git a/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java b/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
index 10d62e9ee3..845b1be6f5 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
+++ b/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
@@ -49,7 +49,7 @@ public class TransactionImplementationPolicyProvider extends BasePolicyProvider<
             for (Object p : policySet.getPolicies()) {
                 if (p instanceof TransactionPolicy) {
                     TransactionInterceptor interceptor =
-                        new TransactionInterceptor(helper, false, (TransactionPolicy)p, null);
+                        new TransactionInterceptor(helper, false, (TransactionPolicy)p, null, getPhase());
                     return interceptor;
                 }
             }
diff --git a/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java b/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
index c40cf96329..9488475b12 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
+++ b/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
@@ -19,7 +19,8 @@
 
 package org.apache.tuscany.sca.policy.transaction.runtime;
 
-import org.apache.tuscany.sca.invocation.Interceptor;
+import java.util.logging.Logger;
+
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.invocation.PhasedInterceptor;
@@ -29,16 +30,20 @@ import org.apache.tuscany.sca.policy.transaction.TransactionPolicy;
  * @version $Rev$ $Date$
  */
 public class TransactionInterceptor implements PhasedInterceptor {
+    private static final Logger logger = Logger.getLogger(TransactionInterceptor.class.getName());
+    
     private Invoker next;
     private TransactionManagerHelper helper;
     private boolean outbound;
     private TransactionPolicy interactionPolicy;
     private TransactionPolicy implementationPolicy;
+    private String phase;
 
     public TransactionInterceptor(TransactionManagerHelper helper,
                                   boolean outbound,
                                   TransactionPolicy interactionPolicy,
-                                  TransactionPolicy implementationPolicy) {
+                                  TransactionPolicy implementationPolicy,
+                                  String phase) {
         super();
         this.helper = helper;
         this.outbound = outbound;
@@ -64,6 +69,7 @@ public class TransactionInterceptor implements PhasedInterceptor {
      * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message)
      */
     public Message invoke(Message msg) {
+        //logger.info("Executing TransactionInterceptor.invoke");
         TransactionalInvocation invocation = new TransactionalInvocation(next, msg);
 
         Message result = null;
@@ -122,8 +128,7 @@ public class TransactionInterceptor implements PhasedInterceptor {
     }
     
     public String getPhase() {
-        // TODO Auto-generated method stub
-        return null;
+        return phase;
     }
 
 }
diff --git a/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java b/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java
index 63ed674583..c6bf3f0c71 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java
+++ b/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java
@@ -48,7 +48,7 @@ public class TransactionReferencePolicyProvider extends BasePolicyProvider<Trans
             for (Object p : policySet.getPolicies()) {
                 if (p instanceof TransactionPolicy) {
                     TransactionInterceptor interceptor =
-                        new TransactionInterceptor(helper, true, (TransactionPolicy)p, null);
+                        new TransactionInterceptor(helper, true, (TransactionPolicy)p, null,getPhase());
                     return interceptor;
                 }
             }
diff --git a/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java b/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java
index d163fd4781..8ba6ba7484 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java
+++ b/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java
@@ -47,7 +47,7 @@ public class TransactionServicePolicyProvider extends BasePolicyProvider<Transac
             for (Object p : policySet.getPolicies()) {
                 if (p instanceof TransactionPolicy) {
                     TransactionInterceptor interceptor =
-                        new TransactionInterceptor(helper, true, (TransactionPolicy)p, null);
+                        new TransactionInterceptor(helper, true, (TransactionPolicy)p, null, getPhase());
                     return interceptor;
                 }
             }