Author: lresende
Date: Thu Feb 25 04:27:18 2010
New Revision: 916115
URL: http://svn.apache.org/viewvc?rev=916115&view=rev
Log:
TUSCANY-3463 - Fixing up policy providers to PolicyExpression wrapper
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=916115&r1=916114&r2=916115&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
Thu Feb 25 04:27:18 2010
@@ -24,6 +24,7 @@
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Phase;
import org.apache.tuscany.sca.invocation.PhasedInterceptor;
+import org.apache.tuscany.sca.policy.PolicyExpression;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.transaction.TransactionPolicy;
import org.apache.tuscany.sca.provider.BasePolicyProvider;
@@ -44,12 +45,11 @@
}
public PhasedInterceptor createInterceptor(Operation operation) {
-/* TODO - 2.x better way of doing this in 2.x */
+ /* TODO - 2.x better way of doing this in 2.x */
for (PolicySet policySet : policySets) {
- for (Object p : policySet.getPolicies()) {
- if (p instanceof TransactionPolicy) {
- TransactionInterceptor interceptor =
- new TransactionInterceptor(helper, false,
(TransactionPolicy)p, null, getPhase());
+ for (PolicyExpression p : policySet.getPolicies()) {
+ if (p.getPolicy() instanceof TransactionPolicy) {
+ TransactionInterceptor interceptor = 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=916115&r1=916114&r2=916115&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
Thu Feb 25 04:27:18 2010
@@ -69,7 +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");
+ logger.info("Executing TransactionInterceptor.invoke");
TransactionalInvocation invocation = new TransactionalInvocation(next,
msg);
Message result = null;
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=916115&r1=916114&r2=916115&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
Thu Feb 25 04:27:18 2010
@@ -25,6 +25,7 @@
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Phase;
import org.apache.tuscany.sca.invocation.PhasedInterceptor;
+import org.apache.tuscany.sca.policy.PolicyExpression;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.transaction.TransactionPolicy;
import org.apache.tuscany.sca.provider.BasePolicyProvider;
@@ -43,12 +44,11 @@
}
public PhasedInterceptor createInterceptor(Operation operation) {
-/* TODO - 2.x better way of doing this in 2.x */
+ /* TODO - 2.x better way of doing this in 2.x */
for (PolicySet policySet : policySets) {
- for (Object p : policySet.getPolicies()) {
- if (p instanceof TransactionPolicy) {
- TransactionInterceptor interceptor =
- new TransactionInterceptor(helper, true,
(TransactionPolicy)p, null,getPhase());
+ for (PolicyExpression p : policySet.getPolicies()) {
+ if (p.getPolicy() instanceof TransactionPolicy) {
+ TransactionInterceptor interceptor = 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=916115&r1=916114&r2=916115&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
Thu Feb 25 04:27:18 2010
@@ -25,6 +25,7 @@
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Phase;
import org.apache.tuscany.sca.invocation.PhasedInterceptor;
+import org.apache.tuscany.sca.policy.PolicyExpression;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.transaction.TransactionPolicy;
import org.apache.tuscany.sca.provider.BasePolicyProvider;
@@ -44,10 +45,9 @@
public PhasedInterceptor createInterceptor(Operation operation) {
for (PolicySet policySet : policySets) {
- for (Object p : policySet.getPolicies()) {
- if (p instanceof TransactionPolicy) {
- TransactionInterceptor interceptor =
- new TransactionInterceptor(helper, true,
(TransactionPolicy)p, null, getPhase());
+ for (PolicyExpression p : policySet.getPolicies()) {
+ if (p.getPolicy() instanceof TransactionPolicy) {
+ TransactionInterceptor interceptor = new
TransactionInterceptor(helper, true, (TransactionPolicy)p, null, getPhase());
return interceptor;
}
}
