4 files changed, 6 insertions, 10 deletions
diff --git a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
index 47359c3484..b105696b5d 100644
--- a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
+++ b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
@@ -20,7 +20,6 @@
 package org.apache.tuscany.sca.binding.sca.axis2.impl;
 
 import java.util.List;
-import java.util.Map;
 
 import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
@@ -41,7 +40,7 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 public class Axis2SCABindingProviderFactory implements BindingProviderFactory<DistributedSCABinding> {
     
     private ExtensionPointRegistry extensionPoints;
-    private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames = null;
+    private List<PolicyHandlerTuple> policyHandlerClassnames = null;
 
     public Axis2SCABindingProviderFactory(ExtensionPointRegistry extensionPoints) {
         this.extensionPoints = extensionPoints;
diff --git a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
index 93ad1d30e5..22f926b73e 100644
--- a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
+++ b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
@@ -21,15 +21,14 @@ package org.apache.tuscany.sca.binding.sca.axis2.impl;
 
 import java.net.URI;
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Logger;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.SCABinding;
 import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
 import org.apache.tuscany.sca.binding.ws.axis2.Axis2ReferenceBindingProvider;
 import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
@@ -71,7 +70,7 @@ public class Axis2SCAReferenceBindingProvider implements ReferenceBindingProvide
                                             RuntimeComponentReference reference,
                                             DistributedSCABinding binding,
                                             ExtensionPointRegistry extensionPoints,
-                                            Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames) {
+                                            List<PolicyHandlerTuple> policyHandlerClassnames) {
 
         ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
         ServletHost servletHost = servletHosts.getServletHosts().get(0);
diff --git a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
index 0ecbf60395..58a50d46dc 100644
--- a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
+++ b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
@@ -20,14 +20,13 @@
 package org.apache.tuscany.sca.binding.sca.axis2.impl;
 
 import java.util.List;
-import java.util.Map;
 import java.util.logging.Logger;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.tuscany.sca.assembly.SCABinding;
 import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
+import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
 import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvider;
 import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
 import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
@@ -63,7 +62,7 @@ public class Axis2SCAServiceBindingProvider implements ServiceBindingProvider {
                                           RuntimeComponentService service,
                                           DistributedSCABinding binding,
                                           ExtensionPointRegistry extensionPoints,
-                                          Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames) {
+                                          List<PolicyHandlerTuple> policyHandlerClassnames) {
 
         ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
         ServletHost servletHost = servletHosts.getServletHosts().get(0);
diff --git a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
index 42f7676ecb..cf13d821f7 100644
--- a/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
+++ b/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
@@ -20,7 +20,6 @@
 package org.apache.tuscany.sca.binding.sca.axis2.impl;
 
 import java.util.List;
-import java.util.Map;
 
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.SCABinding;
@@ -59,7 +58,7 @@ public class Axis2SCAServiceProvider extends Axis2ServiceProvider {
                                    WebServiceBinding wsBinding,
                                    ServletHost servletHost,
                                    MessageFactory messageFactory,
-                                   Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames)  {
+                                   List<PolicyHandlerTuple> policyHandlerClassnames)  {
         
         super(component, 
                 service,