Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java?rev=792358&r1=792357&r2=792358&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java (original) +++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java Wed Jul 8 23:39:36 2009 @@ -21,39 +21,29 @@ 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 @@ } 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() { } }
Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java?rev=792358&r1=792357&r2=792358&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java (original) +++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java Wed Jul 8 23:39:36 2009 @@ -23,16 +23,17 @@ 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 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) Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java?rev=792358&r1=792357&r2=792358&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java (original) +++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java Wed Jul 8 23:39:36 2009 @@ -23,8 +23,7 @@ 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 @@ 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 @@ 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 String getPhase() { - return Phase.IMPLEMENTATION_POLICY; + public void start() { + } + + public void stop() { } } Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java?rev=792358&r1=792357&r2=792358&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java (original) +++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java Wed Jul 8 23:39:36 2009 @@ -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 @@ 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; } } Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java?rev=792358&r1=792357&r2=792358&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java (original) +++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java Wed Jul 8 23:39:36 2009 @@ -23,8 +23,7 @@ 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 @@ 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 @@ 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 String getPhase() { - return Phase.IMPLEMENTATION_POLICY; + public void start() { } + + public void stop() { + } } Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java?rev=792358&r1=792357&r2=792358&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java (original) +++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java Wed Jul 8 23:39:36 2009 @@ -24,15 +24,16 @@ 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 @@ } return getNext().invoke(msg); } + + public String getPhase() { + return Phase.IMPLEMENTATION_POLICY; + } } Modified: tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java?rev=792358&r1=792357&r2=792358&view=diff ============================================================================== --- tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java (original) +++ tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java Wed Jul 8 23:39:36 2009 @@ -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 @@ 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; }
