Merge branch 'master' of ssh://ogattaz@dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel.git

3 files changed, 10 insertions, 2 deletions

diff --git a/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java b/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java
index f65d26e..6a35c88 100644
--- a/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java
+++ b/src/main/java/com/c2kernel/entity/proxy/ProxyManager.java
@@ -40,7 +40,7 @@ public class ProxyManager
     {

         Logger.msg(5, "ProxyManager - Starting.....");

 

-        Iterator<Path> servers = Gateway.getLookup().search(new DomainPath("/servers"), new Property("Type", "Server"));

+        Iterator<Path> servers = Gateway.getLookup().search(new DomainPath("/servers"), new Property("Type", "Server", false));

         while(servers.hasNext()) {

             Path thisServerPath = servers.next();

             try {

diff --git a/src/main/java/com/c2kernel/process/resource/Resource.java b/src/main/java/com/c2kernel/process/resource/Resource.java
index 2ee95c5..7e2e081 100644
--- a/src/main/java/com/c2kernel/process/resource/Resource.java
+++ b/src/main/java/com/c2kernel/process/resource/Resource.java
@@ -18,7 +18,8 @@ import com.c2kernel.utils.Logger;
  * @version $Revision: 1.71 $

  **************************************************************************/

 public class Resource implements ResourceLoader {

-    private final Hashtable<String, String> txtCache = new Hashtable<String, String>();

+

+	private final Hashtable<String, String> txtCache = new Hashtable<String, String>();

     private final URL baseURL;

     private final HashMap<String, URL> moduleBaseURLs = new HashMap<String, URL>();

     private final HashMap<String, URL> allBaseURLs = new HashMap<String, URL>();

@@ -37,6 +38,11 @@ public class Resource implements ResourceLoader {
     }

 

     @Override

+	public ClassLoader getClassLoader(String className) {

+		return Resource.class.getClassLoader();

+	}

+    

+    @Override

 	public Class<?> getClassForName(String name) throws ClassNotFoundException {

 		return Class.forName(name);

 	}

diff --git a/src/main/java/com/c2kernel/process/resource/ResourceLoader.java b/src/main/java/com/c2kernel/process/resource/ResourceLoader.java
index 2bbc4d1..7d9ce20 100644
--- a/src/main/java/com/c2kernel/process/resource/ResourceLoader.java
+++ b/src/main/java/com/c2kernel/process/resource/ResourceLoader.java
@@ -38,6 +38,8 @@ public interface ResourceLoader {
 	

 	public Class<?> getClassForName(String name)

 			throws ClassNotFoundException;

+	

+	public ClassLoader getClassLoader(String className);

 

 	public Enumeration<URL> getModuleDefURLs() throws Exception;