diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-04 16:43:19 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-04 16:43:19 +0000 |
commit | 292f4bbb201e20c025426b310ed62e306bd96210 (patch) | |
tree | 237cb620f803374c2834c39e1f3d5ac5ca775d81 /sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca | |
parent | 3ec81c5828e707ae52a283f285e83889b82fb989 (diff) |
Move the runtime over to use Axis2 1.5.1. Three main parts to this 1) replace binding-ws-axis2 and binding binding-ws-axis2-policy with binding-ws-runtime-axis which is still very much a work in progress 2) correct the axis/axiom version references across the project and make the various OSGi environments work 3) start fixing policy provides to allow the ws binding to exploit the binding wire.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@906557 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca')
4 files changed, 12 insertions, 41 deletions
diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java index d4d8e59429..4c8d452c2d 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java @@ -25,34 +25,19 @@ import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.provider.BasePolicyProvider; import org.apache.tuscany.sca.provider.PolicyProvider; /** * @version $Rev$ $Date$ */ -public class BasicAuthenticationReferencePolicyProvider implements PolicyProvider { +public class BasicAuthenticationReferencePolicyProvider extends BasePolicyProvider<BasicAuthenticationPolicy> { private EndpointReference endpointReference; public BasicAuthenticationReferencePolicyProvider(EndpointReference endpointReference) { - super(); + super(BasicAuthenticationPolicy.class, endpointReference); this.endpointReference = endpointReference; } - - private PolicySet findPolicySet() { - List<PolicySet> policySets = endpointReference.getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (BasicAuthenticationPolicy.class.isInstance(p)) { - return ps; - } - } - } - return null; - } - - private String getContext() { - return endpointReference.getURI(); - } /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java index b640ec60e5..48effb2dc1 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java @@ -25,35 +25,20 @@ import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.provider.BasePolicyProvider; import org.apache.tuscany.sca.provider.PolicyProvider; /** * @version $Rev$ $Date$ */ -public class BasicAuthenticationServicePolicyProvider implements PolicyProvider { +public class BasicAuthenticationServicePolicyProvider extends BasePolicyProvider<BasicAuthenticationPolicy> { private Endpoint endpoint; public BasicAuthenticationServicePolicyProvider(Endpoint endpoint) { - super(); + super(BasicAuthenticationPolicy.class, endpoint); this.endpoint = endpoint; } - private PolicySet findPolicySet() { - List<PolicySet> policySets = endpoint.getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (BasicAuthenticationPolicy.class.isInstance(p)) { - return ps; - } - } - } - return null; - } - - private String getContext() { - return endpoint.getURI(); - } - /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) */ 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 2783a37316..ced2543c38 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 @@ -25,18 +25,19 @@ import org.apache.tuscany.sca.assembly.Implementation; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.provider.BasePolicyProvider; import org.apache.tuscany.sca.provider.PolicyProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; /** * @version $Rev$ $Date$ */ -public class SecurityIdentityImplementationPolicyProvider implements PolicyProvider { +public class SecurityIdentityImplementationPolicyProvider extends BasePolicyProvider<SecurityIdentityPolicy> { private RuntimeComponent component; private Implementation implementation; public SecurityIdentityImplementationPolicyProvider(RuntimeComponent component) { - super(); + super(SecurityIdentityPolicy.class, component); this.component = component; this.implementation = component.getImplementation(); } 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 6666469b75..6425ae7fca 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 @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.assembly.Implementation; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.provider.PolicyProvider; +import org.apache.tuscany.sca.provider.BasePolicyProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; /** @@ -33,12 +33,12 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent; * * @version $Rev$ $Date$ */ -public class JaasAuthenticationImplementationPolicyProvider implements PolicyProvider { +public class JaasAuthenticationImplementationPolicyProvider extends BasePolicyProvider<JaasAuthenticationPolicy> { private RuntimeComponent component; private Implementation implementation; public JaasAuthenticationImplementationPolicyProvider(RuntimeComponent component) { - super(); + super(JaasAuthenticationPolicy.class, component); this.component = component; this.implementation = component.getImplementation(); } |