diff options
9 files changed, 20 insertions, 12 deletions
diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java index 10e7c8ecb2..771bd0b8fa 100644 --- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java +++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java @@ -181,7 +181,7 @@ public class PolicyAttachmentBuilderImpl implements CompositeBuilder { } - // The node can be a component, service, reference or binding + // The node can be a component, implementation, service, reference or binding String index = getStructuralURI(node); PolicySubject subject = lookup(composite, index); if (subject != null) { diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java index 8e04a6ae47..c4fb557f04 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java @@ -785,8 +785,7 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint } chain.addInvoker(invoker); } - // TODO - EPR - don't we need to get the policy from the right level in the - // model rather than the leafmost level + List<PolicyProvider> pps = ((RuntimeComponent)component).getPolicyProviders(); if (pps != null) { for (PolicyProvider p : pps) { diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java index 7cbb4d7a0c..a5dd89f75a 100644 --- a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java +++ b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java @@ -70,10 +70,15 @@ abstract class BaseJavaImplementationImpl extends ImplementationImpl implements return getType() + " (class=" + getName() + ")"; } +/* TUSCANY-3876 - disable implementation model sharing so that + * we can get implementation policy modelled on an + * impementation by implementation basis rather than + * storing it on the component @Override public int hashCode() { return String.valueOf(getName()).hashCode(); } +*/ @Override public boolean equals(Object obj) { diff --git a/sca-java-2.x/trunk/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/sca-java-2.x/trunk/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java index 66a0ba2b51..2963d8ce53 100644 --- a/sca-java-2.x/trunk/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java +++ b/sca-java-2.x/trunk/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java @@ -33,7 +33,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent; public class JDKLoggingImplementationPolicyProvider extends BasePolicyProvider<JDKLoggingPolicy> { public JDKLoggingImplementationPolicyProvider(RuntimeComponent component) { - super(JDKLoggingPolicy.class, component); + super(JDKLoggingPolicy.class, component.getImplementation()); } /** diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java index ebbc2ba5ff..04d7152a49 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java @@ -36,7 +36,7 @@ public class SecurityIdentityImplementationPolicyProvider extends BasePolicyProv private Implementation implementation; public SecurityIdentityImplementationPolicyProvider(RuntimeComponent component) { - super(SecurityIdentityPolicy.class, component); + super(SecurityIdentityPolicy.class, component.getImplementation()); this.component = component; this.implementation = component.getImplementation(); } @@ -61,7 +61,7 @@ public class SecurityIdentityImplementationPolicyProvider extends BasePolicyProv } */ - List<PolicySet> policySets = component.getPolicySets(); + List<PolicySet> policySets = implementation.getPolicySets(); for (PolicySet ps : policySets) { for (Object p : ps.getPolicies()) { if (SecurityIdentityPolicy.class.isInstance(p)) { diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java index 6425ae7fca..20a064574d 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java @@ -38,7 +38,7 @@ public class JaasAuthenticationImplementationPolicyProvider extends BasePolicyPr private Implementation implementation; public JaasAuthenticationImplementationPolicyProvider(RuntimeComponent component) { - super(JaasAuthenticationPolicy.class, component); + super(JaasAuthenticationPolicy.class, component.getImplementation()); this.component = component; this.implementation = component.getImplementation(); } @@ -63,7 +63,7 @@ public class JaasAuthenticationImplementationPolicyProvider extends BasePolicyPr } */ - List<PolicySet> policySets = component.getPolicySets(); + List<PolicySet> policySets = implementation.getPolicySets(); for (PolicySet ps : policySets) { for (Object p : ps.getPolicies()) { if (JaasAuthenticationPolicy.class.isInstance(p)) { diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java b/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java index dc042ed5cc..bd75472256 100644 --- a/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java +++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java @@ -35,7 +35,7 @@ public class TransactionImplementationPolicyProvider extends BasePolicyProvider< private TransactionManagerHelper helper; public TransactionImplementationPolicyProvider(TransactionManagerHelper helper, RuntimeComponent component) { - super(TransactionPolicy.class, component); + super(TransactionPolicy.class, component.getImplementation()); this.helper = helper; } diff --git a/sca-java-2.x/trunk/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java b/sca-java-2.x/trunk/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java index 90cf5e6523..33d2254798 100644 --- a/sca-java-2.x/trunk/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java +++ b/sca-java-2.x/trunk/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java @@ -33,7 +33,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent; public class TestPolicyProviderImplementation extends BasePolicyProvider<TestPolicy> {
public TestPolicyProviderImplementation(RuntimeComponent component) {
- super(TestPolicy.class, component);
+ super(TestPolicy.class, component.getImplementation());
}
/**
@@ -41,8 +41,11 @@ public class TestPolicyProviderImplementation extends BasePolicyProvider<TestPol */
public PhasedInterceptor createInterceptor(Operation operation) {
List<TestPolicy> policies = findPolicies();
- return policies.isEmpty() ? null : new TestPolicyInterceptor(subject, getContext(), operation,
- policies, Phase.IMPLEMENTATION_POLICY);
+ return policies.isEmpty() ? null : new TestPolicyInterceptor(subject,
+ getContext(),
+ operation,
+ policies,
+ Phase.IMPLEMENTATION_POLICY);
}
}
diff --git a/sca-java-2.x/trunk/testing/itest/policy/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/pom.xml index 14335b254a..f6132dc3ac 100644 --- a/sca-java-2.x/trunk/testing/itest/policy/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/policy/pom.xml @@ -32,6 +32,7 @@ <modules> <module>matching</module> <module>wspolicy</module> + <module>interceptors</module> </modules> </project> |