You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/02/23 08:03:26 UTC

svn commit: r915211 - /tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/

Author: lresende
Date: Tue Feb 23 07:03:26 2010
New Revision: 915211

URL: http://svn.apache.org/viewvc?rev=915211&view=rev
Log:
Providing phase value for the interceptor

Modified:
    tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
    tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
    tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java
    tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java

Modified: tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java?rev=915211&r1=915210&r2=915211&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java Tue Feb 23 07:03:26 2010
@@ -49,7 +49,7 @@
             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;
                 }
             }

Modified: tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java?rev=915211&r1=915210&r2=915211&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java Tue Feb 23 07:03:26 2010
@@ -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 @@
  * @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 @@
      * @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 String getPhase() {
-        // TODO Auto-generated method stub
-        return null;
+        return phase;
     }
 
 }

Modified: tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java?rev=915211&r1=915210&r2=915211&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java Tue Feb 23 07:03:26 2010
@@ -48,7 +48,7 @@
             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;
                 }
             }

Modified: tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java?rev=915211&r1=915210&r2=915211&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java Tue Feb 23 07:03:26 2010
@@ -47,7 +47,7 @@
             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;
                 }
             }