Make the ServiceDiscovery pluggable and add support for OSGi-based service discoverer

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@675040 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 5 deletions

diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index c49ef21547..2ad7edbd6f 100644
--- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
@@ -188,11 +188,11 @@ public interface JavaImplementation extends BaseJavaImplementation {
     /**
      * @return the map of a policy handler class names
      */
-    Map<ClassLoader, List<PolicyHandlerTuple>> getPolicyHandlerClassNames();
+    List<PolicyHandlerTuple> getPolicyHandlerClassNames();
 
     /**
      * @param policyHandlerClassNames Map of policyhandler class names
      */
-    void setPolicyHandlerClassNames(Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames);
+    void setPolicyHandlerClassNames(List<PolicyHandlerTuple> policyHandlerClassNames);
 
 }
diff --git a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index 8aa62ae62c..375896cf26 100644
--- a/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
@@ -51,7 +51,7 @@ public class JavaImplementationImpl extends BaseJavaImplementationImpl implement
     private long maxAge = -1;
     private long maxIdleTime = -1;
     private JavaScopeImpl scope = JavaScopeImpl.STATELESS;
-    private Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames = null;
+    private List<PolicyHandlerTuple> policyHandlerClassNames = null;
     
     protected JavaImplementationImpl() {
         super();
@@ -157,11 +157,11 @@ public class JavaImplementationImpl extends BaseJavaImplementationImpl implement
         this.maxIdleTime = maxIdleTime;
     }
 
-    public Map<ClassLoader, List<PolicyHandlerTuple>> getPolicyHandlerClassNames() {
+    public List<PolicyHandlerTuple> getPolicyHandlerClassNames() {
         return policyHandlerClassNames;
     }
 
-    public void setPolicyHandlerClassNames(Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames) {
+    public void setPolicyHandlerClassNames(List<PolicyHandlerTuple> policyHandlerClassNames) {
         this.policyHandlerClassNames = policyHandlerClassNames;
     }