Author: slaws
Date: Thu Jun 16 12:13:44 2011
New Revision: 1136391
URL: http://svn.apache.org/viewvc?rev=1136391&view=rev
Log:
TUSCANY-3876 - minimum changes to turn of implementation model sharing and
represent implementation policy correctly.
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
tuscany/sca-java-2.x/trunk/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
tuscany/sca-java-2.x/trunk/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java
tuscany/sca-java-2.x/trunk/testing/itest/policy/pom.xml
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java?rev=1136391&r1=1136390&r2=1136391&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
Thu Jun 16 12:13:44 2011
@@ -181,7 +181,7 @@ public class PolicyAttachmentBuilderImpl
}
- // 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) {
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java?rev=1136391&r1=1136390&r2=1136391&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
Thu Jun 16 12:13:44 2011
@@ -785,8 +785,7 @@ public class RuntimeEndpointImpl extends
}
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) {
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java?rev=1136391&r1=1136390&r2=1136391&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
Thu Jun 16 12:13:44 2011
@@ -70,10 +70,15 @@ abstract class BaseJavaImplementationImp
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) {
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java?rev=1136391&r1=1136390&r2=1136391&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
Thu Jun 16 12:13:44 2011
@@ -33,7 +33,7 @@ import org.apache.tuscany.sca.runtime.Ru
public class JDKLoggingImplementationPolicyProvider extends
BasePolicyProvider<JDKLoggingPolicy> {
public JDKLoggingImplementationPolicyProvider(RuntimeComponent component) {
- super(JDKLoggingPolicy.class, component);
+ super(JDKLoggingPolicy.class, component.getImplementation());
}
/**
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java?rev=1136391&r1=1136390&r2=1136391&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
Thu Jun 16 12:13:44 2011
@@ -36,7 +36,7 @@ public class SecurityIdentityImplementat
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 SecurityIdentityImplementat
}
*/
- List<PolicySet> policySets = component.getPolicySets();
+ List<PolicySet> policySets = implementation.getPolicySets();
for (PolicySet ps : policySets) {
for (Object p : ps.getPolicies()) {
if (SecurityIdentityPolicy.class.isInstance(p)) {
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java?rev=1136391&r1=1136390&r2=1136391&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
Thu Jun 16 12:13:44 2011
@@ -38,7 +38,7 @@ public class JaasAuthenticationImplement
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 JaasAuthenticationImplement
}
*/
- List<PolicySet> policySets = component.getPolicySets();
+ List<PolicySet> policySets = implementation.getPolicySets();
for (PolicySet ps : policySets) {
for (Object p : ps.getPolicies()) {
if (JaasAuthenticationPolicy.class.isInstance(p)) {
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/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-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java?rev=1136391&r1=1136390&r2=1136391&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
Thu Jun 16 12:13:44 2011
@@ -35,7 +35,7 @@ public class TransactionImplementationPo
private TransactionManagerHelper helper;
public TransactionImplementationPolicyProvider(TransactionManagerHelper
helper, RuntimeComponent component) {
- super(TransactionPolicy.class, component);
+ super(TransactionPolicy.class, component.getImplementation());
this.helper = helper;
}
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java?rev=1136391&r1=1136390&r2=1136391&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/policy/interceptors/src/main/java/testpolicy/TestPolicyProviderImplementation.java
Thu Jun 16 12:13:44 2011
@@ -33,7 +33,7 @@ import org.apache.tuscany.sca.runtime.Ru
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 TestPolicyProviderImplement
*/
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);
}
}
Modified: tuscany/sca-java-2.x/trunk/testing/itest/policy/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/policy/pom.xml?rev=1136391&r1=1136390&r2=1136391&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/policy/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/policy/pom.xml Thu Jun 16 12:13:44
2011
@@ -32,6 +32,7 @@
<modules>
<module>matching</module>
<module>wspolicy</module>
+ <module>interceptors</module>
</modules>
</project>
