You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/12/01 12:35:49 UTC
svn commit: r722040 - in /tuscany/branches/sca-java-1.x/modules:
binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/
binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/
core-sp...
Author: slaws
Date: Mon Dec 1 03:35:46 2008
New Revision: 722040
URL: http://svn.apache.org/viewvc?rev=722040&view=rev
Log:
remove PolicyProviderRRB and detect RRB policies by looking at the phase.
Removed:
tuscany/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderRRB.java
Modified:
tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
Modified: tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java?rev=722040&r1=722039&r2=722040&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java Mon Dec 1 03:35:46 2008
@@ -29,14 +29,13 @@
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
import org.apache.tuscany.sca.policy.util.PolicyHandler;
import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderRRB;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
/**
* @version $Rev$ $Date$
*/
-public class JMSTokenAuthenticationReferencePolicyProvider implements PolicyProviderRRB {
+public class JMSTokenAuthenticationReferencePolicyProvider implements PolicyProvider {
private RuntimeComponent component;
private RuntimeComponentReference reference;
private Binding binding;
@@ -77,19 +76,16 @@
* @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
*/
public Interceptor createInterceptor(Operation operation) {
- return null;
- }
-
- public Interceptor createBindingInterceptor() {
PolicySet ps = findPolicySet();
return ps == null ? null : new JMSTokenAuthenticationReferencePolicyInterceptor(getContext(), ps);
- }
+
+ }
/**
* @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
*/
public String getPhase() {
- return Phase.REFERENCE_POLICY;
+ return Phase.REFERENCE_BINDING_POLICY;
}
}
Modified: tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java?rev=722040&r1=722039&r2=722040&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java Mon Dec 1 03:35:46 2008
@@ -29,14 +29,13 @@
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
import org.apache.tuscany.sca.policy.util.PolicyHandler;
import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderRRB;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
/**
* @version $Rev$ $Date$
*/
-public class JMSTokenAuthenticationServicePolicyProvider implements PolicyProviderRRB {
+public class JMSTokenAuthenticationServicePolicyProvider implements PolicyProvider {
private RuntimeComponent component;
private RuntimeComponentService service;
private Binding binding;
@@ -75,19 +74,15 @@
* @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
*/
public Interceptor createInterceptor(Operation operation) {
- return null;
- }
-
- public Interceptor createBindingInterceptor() {
PolicySet ps = findPolicySet();
return ps == null ? null : new JMSTokenAuthenticationServicePolicyInterceptor(getContext(), ps);
- }
+ }
/**
* @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
*/
public String getPhase() {
- return Phase.SERVICE_POLICY;
+ return Phase.SERVICE_BINDING_POLICY;
}
}
Modified: tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java?rev=722040&r1=722039&r2=722040&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java Mon Dec 1 03:35:46 2008
@@ -29,14 +29,13 @@
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
import org.apache.tuscany.sca.policy.util.PolicyHandler;
import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderRRB;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
/**
* @version $Rev$ $Date$
*/
-public class JMSHeaderReferencePolicyProvider implements PolicyProviderRRB {
+public class JMSHeaderReferencePolicyProvider implements PolicyProvider {
private RuntimeComponent component;
private RuntimeComponentReference reference;
private Binding binding;
@@ -77,14 +76,10 @@
* @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
*/
public Interceptor createInterceptor(Operation operation) {
- return null;
- }
-
- public Interceptor createBindingInterceptor() {
PolicySet ps = findPolicySet();
return ps == null ? null : new JMSHeaderReferencePolicyInterceptor(getContext(), component, reference, binding, ps);
}
-
+
/**
* @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
*/
Modified: tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java?rev=722040&r1=722039&r2=722040&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java (original)
+++ tuscany/branches/sca-java-1.x/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java Mon Dec 1 03:35:46 2008
@@ -41,11 +41,8 @@
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.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
import org.apache.tuscany.sca.provider.ImplementationProvider;
import org.apache.tuscany.sca.provider.PolicyProvider;
-import org.apache.tuscany.sca.provider.PolicyProviderRRB;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
import org.apache.tuscany.sca.provider.ReferenceBindingProviderRRB;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
@@ -235,8 +232,8 @@
List<PolicyProvider> pps = ((RuntimeComponentReference)reference).getPolicyProviders(referenceBinding);
if (pps != null) {
for (PolicyProvider p : pps) {
- if (p instanceof PolicyProviderRRB) {
- Interceptor interceptor = ((PolicyProviderRRB)p).createBindingInterceptor();
+ if (p.getPhase().equals(Phase.REFERENCE_BINDING_POLICY)) {
+ Interceptor interceptor = p.createInterceptor(null);
if (interceptor != null) {
bindingInvocationChain.addInterceptor(Phase.REFERENCE_BINDING_POLICY, interceptor);
}
@@ -260,8 +257,8 @@
List<PolicyProvider> pps = ((RuntimeComponentService)service).getPolicyProviders(serviceBinding);
if (pps != null) {
for (PolicyProvider p : pps) {
- if (p instanceof PolicyProviderRRB) {
- Interceptor interceptor = ((PolicyProviderRRB)p).createBindingInterceptor();
+ if (p.getPhase().equals(Phase.SERVICE_BINDING_POLICY)) {
+ Interceptor interceptor = p.createInterceptor(null);
if (interceptor != null) {
bindingInvocationChain.addInterceptor(Phase.SERVICE_BINDING_POLICY, interceptor);
}