svn commit: r909489 - in /tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl: RuntimeEndpointImpl.java RuntimeEndpointReferenceImpl.java

[slaws]

Author: slaws
Date: Fri Feb 12 16:24:26 2010
New Revision: 909489

URL: http://svn.apache.org/viewvc?rev=909489&view=rev
Log:
Enable addition of policies to binding chains

Modified:
    
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
    
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java?rev=909489&r1=909488&r2=909489&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
 Fri Feb 12 16:24:26 2010
@@ -315,16 +315,12 @@
         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);
-                    }
+                Interceptor interceptor = p.createBindingInterceptor();
+                if (interceptor != null) {
+                    bindingInvocationChain.addInterceptor(interceptor);
                 }
-*/                
             }
+
         }
 
         // TODO - add something on the end of the wire to invoke the

Modified: 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java?rev=909489&r1=909488&r2=909489&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
 Fri Feb 12 16:24:26 2010
@@ -346,15 +346,10 @@
         // 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);
-                }
+           Interceptor interceptor = p.createBindingInterceptor();
+            if (interceptor != null) {
+                bindingInvocationChain.addInterceptor(interceptor);
             }
-*/            
         }
     }
 
@@ -392,9 +387,9 @@
         List<PolicyProvider> pps = getPolicyProviders();
         if (pps != null) {
             for (PolicyProvider p : pps) {
-                Interceptor interceptor = p.createInterceptor(operation);
+                Interceptor interceptor = p.createBindingInterceptor();
                 if (interceptor != null) {
-                    chain.addInterceptor(p.createInterceptor(operation));
+                    chain.addInterceptor(interceptor);
                 }
             }
         }