diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-08 23:39:36 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-08 23:39:36 +0000 |
commit | 9059026361e282b7f867817bcf8fd721030c8f8d (patch) | |
tree | b5cb829671d35f8bcd604570cd8c1a8f03ae07f7 /java/sca/modules/policy-security/src/main/java/org | |
parent | a36d95000a638694fa3004cf5a2da0fe44808921 (diff) |
Refactor the PolicyProviderFactory to take Endpoint and EndpointReference
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@792358 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/policy-security/src/main/java/org')
11 files changed, 102 insertions, 159 deletions
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java index 348934bd6c..9b894101ef 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java @@ -19,14 +19,12 @@ package org.apache.tuscany.sca.policy.authentication.basic; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Implementation; +import org.apache.tuscany.sca.assembly.Endpoint; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.provider.PolicyProvider; import org.apache.tuscany.sca.provider.PolicyProviderFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; /** * @version $Rev$ $Date$ @@ -39,37 +37,23 @@ public class BasicAuthenticationPolicyProviderFactory implements PolicyProviderF this.registry = registry; } - /** - * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createImplementationPolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.assembly.Implementation) - */ - public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) { - return null;//new BasicAuthenticationImplementationPolicyProvider(component, implementation); + public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component) { + return null; } - /** - * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createReferencePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding) - */ - public PolicyProvider createReferencePolicyProvider(RuntimeComponent component, - RuntimeComponentReference reference, - Binding binding) { - return new BasicAuthenticationReferencePolicyProvider(component, reference, binding); + public PolicyProvider createReferencePolicyProvider(EndpointReference endpointReference) { + return new BasicAuthenticationReferencePolicyProvider(endpointReference); } /** * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createServicePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding) */ - public PolicyProvider createServicePolicyProvider(RuntimeComponent component, - RuntimeComponentService service, - Binding binding) { - return new BasicAuthenticationServicePolicyProvider(component, service, binding); + public PolicyProvider createServicePolicyProvider(Endpoint endpoint) { + return new BasicAuthenticationServicePolicyProvider(endpoint); } - /** - * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType() - */ - public Class getModelType() { - // TODO Auto-generated method stub - return null; + public Class<BasicAuthenticationPolicy> getModelType() { + return BasicAuthenticationPolicy.class; } } diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java index ef1e66b7de..189866a23f 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java @@ -22,9 +22,10 @@ import javax.security.auth.Subject; import javax.xml.namespace.QName; import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; +import org.apache.tuscany.sca.invocation.Phase; +import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; import org.apache.tuscany.sca.policy.security.SecurityUtil; @@ -32,7 +33,7 @@ import org.apache.tuscany.sca.policy.security.SecurityUtil; * * @version $Rev$ $Date$ */ -public class BasicAuthenticationReferencePolicyInterceptor implements Interceptor { +public class BasicAuthenticationReferencePolicyInterceptor implements PhasedInterceptor { private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1"; public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, "wsBasicAuthentication"); @@ -93,4 +94,8 @@ public class BasicAuthenticationReferencePolicyInterceptor implements Intercepto public void setNext(Invoker next) { this.next = next; } + + public String getPhase() { + return Phase.REFERENCE_POLICY; + } } diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java index c5352e1f57..d4d8e59429 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java @@ -21,41 +21,29 @@ package org.apache.tuscany.sca.policy.authentication.basic; import java.util.List; -import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Interceptor; -import org.apache.tuscany.sca.invocation.Phase; +import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.policy.PolicySubject; import org.apache.tuscany.sca.provider.PolicyProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; /** * @version $Rev$ $Date$ */ public class BasicAuthenticationReferencePolicyProvider implements PolicyProvider { - private RuntimeComponent component; - private RuntimeComponentReference reference; - private Binding binding; + private EndpointReference endpointReference; - public BasicAuthenticationReferencePolicyProvider(RuntimeComponent component, - RuntimeComponentReference reference, - Binding binding) { + public BasicAuthenticationReferencePolicyProvider(EndpointReference endpointReference) { super(); - this.component = component; - this.reference = reference; - this.binding = binding; + this.endpointReference = endpointReference; } private PolicySet findPolicySet() { - if (binding instanceof PolicySubject) { - List<PolicySet> policySets = ((PolicySubject)binding).getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (BasicAuthenticationPolicy.class.isInstance(p)) { - return ps; - } + List<PolicySet> policySets = endpointReference.getPolicySets(); + for (PolicySet ps : policySets) { + for (Object p : ps.getPolicies()) { + if (BasicAuthenticationPolicy.class.isInstance(p)) { + return ps; } } } @@ -63,27 +51,21 @@ public class BasicAuthenticationReferencePolicyProvider implements PolicyProvide } private String getContext() { - return "component.reference: " + component.getURI() - + "#" - + reference.getName() - + "(" - + binding.getClass().getName() - + ")"; + return endpointReference.getURI(); } /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) */ - public Interceptor createInterceptor(Operation operation) { + public PhasedInterceptor createInterceptor(Operation operation) { PolicySet ps = findPolicySet(); return ps == null ? null : new BasicAuthenticationReferencePolicyInterceptor(getContext(), operation, ps); } - /** - * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase() - */ - public String getPhase() { - return Phase.REFERENCE_POLICY; + public void start() { + } + + public void stop() { } } diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java index da4d31a11a..39f70c7e78 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java @@ -23,9 +23,10 @@ import javax.security.auth.Subject; import javax.xml.namespace.QName; import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; +import org.apache.tuscany.sca.invocation.Phase; +import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; import org.apache.tuscany.sca.policy.security.SecurityUtil; @@ -36,7 +37,7 @@ import org.apache.tuscany.sca.policy.security.SecurityUtil; * * @version $Rev$ $Date$ */ -public class BasicAuthenticationServicePolicyInterceptor implements Interceptor { +public class BasicAuthenticationServicePolicyInterceptor implements PhasedInterceptor { private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.1"; public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, "wsBasicAuthentication"); @@ -93,4 +94,9 @@ public class BasicAuthenticationServicePolicyInterceptor implements Interceptor public void setNext(Invoker next) { this.next = next; } + + public String getPhase() { + return Phase.SERVICE_POLICY; + } + } diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java index b8684e29c0..b640ec60e5 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java @@ -21,39 +21,29 @@ package org.apache.tuscany.sca.policy.authentication.basic; import java.util.List; -import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Interceptor; -import org.apache.tuscany.sca.invocation.Phase; +import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.policy.PolicySubject; import org.apache.tuscany.sca.provider.PolicyProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; /** * @version $Rev$ $Date$ */ public class BasicAuthenticationServicePolicyProvider implements PolicyProvider { - private RuntimeComponent component; - private RuntimeComponentService service; - private Binding binding; + private Endpoint endpoint; - public BasicAuthenticationServicePolicyProvider(RuntimeComponent component, RuntimeComponentService service, Binding binding) { + public BasicAuthenticationServicePolicyProvider(Endpoint endpoint) { super(); - this.component = component; - this.service = service; - this.binding = binding; + this.endpoint = endpoint; } private PolicySet findPolicySet() { - if (binding instanceof PolicySubject) { - List<PolicySet> policySets = ((PolicySubject)binding).getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (BasicAuthenticationPolicy.class.isInstance(p)) { - return ps; - } + List<PolicySet> policySets = endpoint.getPolicySets(); + for (PolicySet ps : policySets) { + for (Object p : ps.getPolicies()) { + if (BasicAuthenticationPolicy.class.isInstance(p)) { + return ps; } } } @@ -61,27 +51,21 @@ public class BasicAuthenticationServicePolicyProvider implements PolicyProvider } private String getContext() { - return "component.service: " + component.getURI() - + "#" - + service.getName() - + "(" - + binding.getClass().getName() - + ")"; + return endpoint.getURI(); } /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) */ - public Interceptor createInterceptor(Operation operation) { + public PhasedInterceptor createInterceptor(Operation operation) { PolicySet ps = findPolicySet(); return ps == null ? null : new BasicAuthenticationServicePolicyInterceptor(getContext(), operation, ps); } + + public void start() { + } - /** - * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase() - */ - public String getPhase() { - return Phase.SERVICE_POLICY; + public void stop() { } } diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java index 1f48b3b30a..773c874a90 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java @@ -23,16 +23,17 @@ import java.util.List; import javax.security.auth.Subject; -import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; +import org.apache.tuscany.sca.invocation.Phase; +import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.security.SecurityUtil; import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ */ -public class SecurityIdentityImplementationPolicyInterceptor implements Interceptor { +public class SecurityIdentityImplementationPolicyInterceptor implements PhasedInterceptor { private List<SecurityIdentityPolicy> securityIdentityPolicies; private Invoker next; @@ -54,6 +55,11 @@ public class SecurityIdentityImplementationPolicyInterceptor implements Intercep public void setNext(Invoker next) { this.next = next; } + + public String getPhase() { + return Phase.IMPLEMENTATION_POLICY; + } + /** * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message) diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java index 38feea21b5..2783a37316 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java @@ -23,8 +23,7 @@ import java.util.List; import org.apache.tuscany.sca.assembly.Implementation; import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Interceptor; -import org.apache.tuscany.sca.invocation.Phase; +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.runtime.RuntimeComponent; @@ -36,10 +35,10 @@ public class SecurityIdentityImplementationPolicyProvider implements PolicyProvi private RuntimeComponent component; private Implementation implementation; - public SecurityIdentityImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) { + public SecurityIdentityImplementationPolicyProvider(RuntimeComponent component) { super(); this.component = component; - this.implementation = implementation; + this.implementation = component.getImplementation(); } private List<SecurityIdentityPolicy> findPolicies(Operation op) { @@ -73,7 +72,7 @@ public class SecurityIdentityImplementationPolicyProvider implements PolicyProvi return polices; } - public Interceptor createInterceptor(Operation operation) { + public PhasedInterceptor createInterceptor(Operation operation) { List<SecurityIdentityPolicy> policies = findPolicies(operation); if (policies == null || policies.isEmpty()) { return null; @@ -82,7 +81,9 @@ public class SecurityIdentityImplementationPolicyProvider implements PolicyProvi } } - public String getPhase() { - return Phase.IMPLEMENTATION_POLICY; + public void start() { + } + + public void stop() { } } diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java index a20f314a2a..80e1494796 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java @@ -19,14 +19,12 @@ package org.apache.tuscany.sca.policy.identity; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Implementation; +import org.apache.tuscany.sca.assembly.Endpoint; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.provider.PolicyProvider; import org.apache.tuscany.sca.provider.PolicyProviderFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; /** * @version $Rev$ $Date$ @@ -39,37 +37,20 @@ public class SecurityIdentityPolicyProviderFactory implements PolicyProviderFact this.registry = registry; } - /** - * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createImplementationPolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.assembly.Implementation) - */ - public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) { - return new SecurityIdentityImplementationPolicyProvider(component, implementation); + public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component) { + return new SecurityIdentityImplementationPolicyProvider(component); } - /** - * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createReferencePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding) - */ - public PolicyProvider createReferencePolicyProvider(RuntimeComponent component, - RuntimeComponentReference reference, - Binding binding) { + public PolicyProvider createReferencePolicyProvider(EndpointReference endpointReference) { return null; } - /** - * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createServicePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding) - */ - public PolicyProvider createServicePolicyProvider(RuntimeComponent component, - RuntimeComponentService service, - Binding binding) { + public PolicyProvider createServicePolicyProvider(Endpoint endpoint) { return null; } - /** - * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType() - */ - public Class getModelType() { - // TODO Auto-generated method stub - return null; + public Class<SecurityIdentityPolicy> getModelType() { + return SecurityIdentityPolicy.class; } } diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java index 203d9ca0ab..6666469b75 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java @@ -23,8 +23,7 @@ import java.util.List; import org.apache.tuscany.sca.assembly.Implementation; import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Interceptor; -import org.apache.tuscany.sca.invocation.Phase; +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.runtime.RuntimeComponent; @@ -38,10 +37,10 @@ public class JaasAuthenticationImplementationPolicyProvider implements PolicyPro private RuntimeComponent component; private Implementation implementation; - public JaasAuthenticationImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) { + public JaasAuthenticationImplementationPolicyProvider(RuntimeComponent component) { super(); this.component = component; - this.implementation = implementation; + this.implementation = component.getImplementation(); } private List<JaasAuthenticationPolicy> findPolicies(Operation op) { @@ -75,7 +74,7 @@ public class JaasAuthenticationImplementationPolicyProvider implements PolicyPro return polices; } - public Interceptor createInterceptor(Operation operation) { + public PhasedInterceptor createInterceptor(Operation operation) { List<JaasAuthenticationPolicy> policies = findPolicies(operation); if (policies == null || policies.isEmpty()) { return null; @@ -84,7 +83,9 @@ public class JaasAuthenticationImplementationPolicyProvider implements PolicyPro } } - public String getPhase() { - return Phase.IMPLEMENTATION_POLICY; + public void start() { } + + public void stop() { + } } diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java index 41a7b62772..247243fcf8 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java @@ -24,15 +24,16 @@ import java.util.List; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginContext; -import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; +import org.apache.tuscany.sca.invocation.Phase; +import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.oasisopen.sca.ServiceRuntimeException; /** * @version $Rev$ $Date$ */ -public class JaasAuthenticationInterceptor implements Interceptor { +public class JaasAuthenticationInterceptor implements PhasedInterceptor { private List<JaasAuthenticationPolicy> authenticationPolicies; private Invoker next; @@ -72,5 +73,9 @@ public class JaasAuthenticationInterceptor implements Interceptor { } return getNext().invoke(msg); } + + public String getPhase() { + return Phase.IMPLEMENTATION_POLICY; + } } diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java index 48a42eb711..ab1ab1870f 100644 --- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java +++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java @@ -19,14 +19,12 @@ package org.apache.tuscany.sca.policy.security.jaas; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Implementation; +import org.apache.tuscany.sca.assembly.Endpoint; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.provider.PolicyProvider; import org.apache.tuscany.sca.provider.PolicyProviderFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; /** * @version $Rev$ $Date$ @@ -37,28 +35,18 @@ public class JaasAuthenticationPolicyProviderFactory implements PolicyProviderFa super(); } - /** - * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createImplementationPolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.assembly.Implementation) - */ - public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component, Implementation implementation) { - return new JaasAuthenticationImplementationPolicyProvider(component, implementation); + public PolicyProvider createImplementationPolicyProvider(RuntimeComponent component) { + return new JaasAuthenticationImplementationPolicyProvider(component); } - /** - * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createReferencePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentReference, org.apache.tuscany.sca.assembly.Binding) - */ - public PolicyProvider createReferencePolicyProvider(RuntimeComponent component, - RuntimeComponentReference reference, - Binding binding) { + public PolicyProvider createReferencePolicyProvider(EndpointReference endpointReference) { return null; } /** * @see org.apache.tuscany.sca.provider.PolicyProviderFactory#createServicePolicyProvider(org.apache.tuscany.sca.runtime.RuntimeComponent, org.apache.tuscany.sca.runtime.RuntimeComponentService, org.apache.tuscany.sca.assembly.Binding) */ - public PolicyProvider createServicePolicyProvider(RuntimeComponent component, - RuntimeComponentService service, - Binding binding) { + public PolicyProvider createServicePolicyProvider(Endpoint endpoint) { return null; } |