diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules')
21 files changed, 107 insertions, 150 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml index aee8f121b5..7d50cd0ae4 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml @@ -216,8 +216,8 @@ Specifies that the SOAP messaging model is used for delivering messages. </sca:description> - <sca:qualifier name="V1_1" default="true"/> - <sca:qualifier name="V1_2"/> + <sca:qualifier name="v1_1" default="true"/> + <sca:qualifier name="v1_2"/> </sca:intent> <sca:intent name="JMS" constrains="sca:binding" intentType="interaction"> diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java index f87938a5cb..1ff7280d07 100644 --- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java +++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java @@ -21,9 +21,11 @@ package org.apache.tuscany.sca.policy.util; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import javax.xml.namespace.QName; +import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.definitions.Definitions; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicyExpression; @@ -93,5 +95,35 @@ public class PolicyHelper { } return policies; } + + public static PolicySet getPolicySet(Binding wsBinding, QName intentName) { + PolicySet returnPolicySet = null; + + if (wsBinding instanceof PolicySubject) { + PolicySubject policiedBinding = (PolicySubject)wsBinding; + for (PolicySet policySet : policiedBinding.getPolicySets()) { + for (Intent intent : policySet.getProvidedIntents()) { + if (intent.getName().equals(intentName)) { + returnPolicySet = policySet; + break; + } + } + } + } + + return returnPolicySet; + } + + public static boolean isIntentRequired(Binding wsBinding, QName intent) { + if (wsBinding instanceof PolicySubject) { + List<Intent> intents = ((PolicySubject)wsBinding).getRequiredIntents(); + for (Intent i : intents) { + if (intent.equals(i.getName())) { + return true; + } + } + } + return getPolicySet(wsBinding, intent) != null; + } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml index 6d3f5b9b8c..4afdce9945 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml @@ -100,7 +100,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java index e630d0cd53..97d065fc50 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java @@ -23,43 +23,25 @@ import java.util.List; import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy; +import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy; import org.apache.tuscany.sca.interfacedef.Operation; 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.BasePolicyProvider; import org.apache.tuscany.sca.provider.PolicyProvider; /** * @version $Rev$ $Date$ */ -public class JMSTokenAuthenticationReferencePolicyProvider implements PolicyProvider { +public class JMSTokenAuthenticationReferencePolicyProvider extends BasePolicyProvider<JMSTokenAuthenticationPolicy> { private EndpointReference endpointReference; public JMSTokenAuthenticationReferencePolicyProvider(EndpointReference endpointReference) { + super(JMSTokenAuthenticationPolicy.class, endpointReference); this.endpointReference = endpointReference; } - - private PolicySet findPolicySet() { - List<PolicySet> policySets = endpointReference.getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (JMSTokenAuthenticationPolicy.class.isInstance(p)) { - return ps; - } - } - } - return null; - } - - private String getContext() { - return "component.reference: " + endpointReference.getComponent().getURI() - + "#" - + endpointReference.getReference().getName() - + "(" - + endpointReference.getBinding().getClass().getName() - + ")"; - } - + /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) */ @@ -76,10 +58,4 @@ public class JMSTokenAuthenticationReferencePolicyProvider implements PolicyProv return Phase.REFERENCE_BINDING_POLICY; } - public void start() { - } - - public void stop() { - } - } diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java index be5ca5dd61..351b1c3f0f 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java @@ -19,48 +19,26 @@ package org.apache.tuscany.sca.binding.jms.policy.authentication.token.provider; -import java.util.List; - import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy; import org.apache.tuscany.sca.interfacedef.Operation; 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.provider.BasePolicyProvider; /** * @version $Rev$ $Date$ */ -public class JMSTokenAuthenticationServicePolicyProvider implements PolicyProvider { +public class JMSTokenAuthenticationServicePolicyProvider extends BasePolicyProvider<JMSTokenAuthenticationPolicy> { private Endpoint endpoint; public JMSTokenAuthenticationServicePolicyProvider(Endpoint endpoint) { + super(JMSTokenAuthenticationPolicy.class, endpoint); this.endpoint = endpoint; } - private PolicySet findPolicySet() { - List<PolicySet> policySets = endpoint.getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (JMSTokenAuthenticationPolicy.class.isInstance(p)) { - return ps; - } - } - } - return null; - } - - private String getContext() { - return "component.service: " + endpoint.getComponent().getURI() - + "#" - + endpoint.getService().getName() - + "(" - + endpoint.getBinding().getClass().getName() - + ")"; - } - /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) */ @@ -76,10 +54,4 @@ public class JMSTokenAuthenticationServicePolicyProvider implements PolicyProvid return Phase.SERVICE_BINDING_POLICY; } - public void start() { - } - - public void stop() { - } - } diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java index 29fc08ed14..3f994da033 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java @@ -27,6 +27,7 @@ import org.apache.tuscany.sca.interfacedef.Operation; 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.BasePolicyProvider; import org.apache.tuscany.sca.provider.PolicyProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; @@ -34,34 +35,14 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentReference; /** * @version $Rev$ $Date$ */ -public class JMSHeaderReferencePolicyProvider implements PolicyProvider { +public class JMSHeaderReferencePolicyProvider extends BasePolicyProvider<JMSHeaderPolicy> { private EndpointReference endpointReference; public JMSHeaderReferencePolicyProvider(EndpointReference endpointReference) { + super(JMSHeaderPolicy.class, endpointReference); this.endpointReference = endpointReference; } - - private PolicySet findPolicySet() { - List<PolicySet> policySets = endpointReference.getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (JMSHeaderPolicy.class.isInstance(p)) { - return ps; - } - } - } - return null; - } - - private String getContext() { - return "component.reference: " + endpointReference.getComponent().getURI() - + "#" - + endpointReference.getReference().getName() - + "(" - + endpointReference.getBinding().getClass().getName() - + ")"; - } /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) @@ -78,10 +59,5 @@ public class JMSHeaderReferencePolicyProvider implements PolicyProvider { return Phase.REFERENCE_BINDING_POLICY; } - public void start() { - } - - public void stop() { - } } diff --git a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java index 3364dd83d9..25791394fe 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java +++ b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java @@ -60,7 +60,7 @@ import org.apache.tuscany.sca.xsd.XSDFactory; */ public class BindingWSDLGenerator { private static final Logger logger = Logger.getLogger(BindingWSDLGenerator.class.getName()); - private static final QName SOAP12_INTENT = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "SOAP.1_2"); + private static final QName SOAP12_INTENT = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "SOAP.v1_2"); public static boolean printWSDL; // external code sets this to print generated WSDL diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java index 8f93476c85..30802feb82 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java @@ -129,6 +129,13 @@ public abstract class BasePolicyProvider<T> implements PolicyProvider { public PhasedInterceptor createInterceptor(Operation operation) { return null; } + + public PhasedInterceptor createBindingInterceptor() { + return null; + } + + public void configureBinding(Object configuration){ + } protected InvocationChain getInvocationChain() { if (subject instanceof RuntimeEndpoint) { diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java index 00ef0d1c3c..35b64ad56f 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java @@ -28,12 +28,31 @@ import org.apache.tuscany.sca.invocation.PhasedInterceptor; public interface PolicyProvider { /** * Create an interceptor for a given operation + * * @param operation - * @return An interceptor that realize the policySet + * @return An interceptor that realizes the policySet */ PhasedInterceptor createInterceptor(Operation operation); /** + * Create a binding interceptor. The binding wire is + * not operation specific so an operation parameter + * isn't required + * + * @return An interceptor that realizes the policySet + */ + PhasedInterceptor createBindingInterceptor(); + + /** + * Give the provider an opportunity to affect the + * binding configuration if required + * + * @param configurationContext the configuration context of the + * binding that will be modified + */ + void configureBinding(Object configuration); + + /** * Start the provider */ void start(); 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 b4743676b0..ce5f72ca94 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 @@ -55,7 +55,6 @@ import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.invocation.MessageFactory; import org.apache.tuscany.sca.invocation.Phase; -import org.apache.tuscany.sca.provider.BindingPolicyProvider; import org.apache.tuscany.sca.provider.BindingProviderFactory; import org.apache.tuscany.sca.provider.EndpointProvider; import org.apache.tuscany.sca.provider.ImplementationProvider; @@ -306,12 +305,15 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint List<PolicyProvider> pps = getPolicyProviders(); if (pps != null) { for (PolicyProvider p : pps) { + // TODO - SL - Need to get the binding policy providers +/* if (p instanceof BindingPolicyProvider) { Interceptor interceptor = ((BindingPolicyProvider)p).createBindingInterceptor(); if (interceptor != null) { bindingInvocationChain.addInterceptor(interceptor); } } +*/ } } diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java index 32078eabc9..fc5a942186 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java @@ -56,7 +56,6 @@ import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.invocation.MessageFactory; import org.apache.tuscany.sca.invocation.Phase; -import org.apache.tuscany.sca.provider.BindingPolicyProvider; import org.apache.tuscany.sca.provider.BindingProviderFactory; import org.apache.tuscany.sca.provider.EndpointReferenceProvider; import org.apache.tuscany.sca.provider.PolicyProvider; @@ -347,12 +346,15 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen // add the policy interceptors to the service binding wire // find out which policies are active for (PolicyProvider p : getPolicyProviders()) { + // TODO - SL - Need to get the binding policy providers +/* if (p instanceof BindingPolicyProvider) { Interceptor interceptor = ((BindingPolicyProvider)p).createBindingInterceptor(); if (interceptor != null) { bindingInvocationChain.addInterceptor(interceptor); } } +*/ } } diff --git a/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml index 027de3659c..f46bd41d7d 100644 --- a/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml @@ -57,7 +57,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -77,7 +77,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml index 485f71e6ea..744fe474da 100644 --- a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml @@ -42,7 +42,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> </dependency> </dependencies> diff --git a/sca-java-2.x/trunk/modules/databinding-json/pom.xml b/sca-java-2.x/trunk/modules/databinding-json/pom.xml index 305477cc11..4d600358f0 100644 --- a/sca-java-2.x/trunk/modules/databinding-json/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-json/pom.xml @@ -69,7 +69,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -93,7 +93,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> </dependency> 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(); } diff --git a/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml b/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml index 12955012a4..b3fe706a7a 100644 --- a/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml +++ b/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -96,7 +96,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml b/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml index 2075bbe047..3a0bcec5da 100644 --- a/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml +++ b/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -90,7 +90,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/sca-java-2.x/trunk/modules/pom.xml b/sca-java-2.x/trunk/modules/pom.xml index d8ae6a5628..b618f2ce93 100644 --- a/sca-java-2.x/trunk/modules/pom.xml +++ b/sca-java-2.x/trunk/modules/pom.xml @@ -53,9 +53,9 @@ <module>binding-sca-runtime-rmi</module> <module>binding-sca-axis2-runtime</module> <module>binding-ws</module> - <module>binding-ws-axis2</module> - <!--module>binding-ws-axis2-15-runtime</module--> - <module>binding-ws-axis2-policy</module> + <!--module>binding-ws-axis2</module--> + <module>binding-ws-runtime-axis2</module> + <!--module>binding-ws-axis2-policy</module--> <module>binding-ws-wsdlgen</module> <module>builder</module> <module>common-java</module> @@ -104,8 +104,8 @@ <module>node-launcher</module> <module>node-launcher-equinox</module> <module>policy-security</module> - <!--module>policy-wspolicy</module--> - <module>policy-xml-ws</module> + <module>policy-wspolicy</module> + <!--module>policy-xml-ws</module--> <module>policy-logging</module> <!--module>policy-transaction</module--> <module>sca-api</module> |