From 48c1fc4028da7eea85dd5f9c3962bc664ce35368 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 24 Jul 2014 16:56:49 +0200
Subject: ResourceLoader can specify a ClassLoader to pass to things like
 Castor

---
 src/main/java/com/c2kernel/process/resource/Resource.java       | 8 +++++++-
 src/main/java/com/c2kernel/process/resource/ResourceLoader.java | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

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>();
@@ -36,6 +37,11 @@ public class Resource implements ResourceLoader {
         return baseURL;
     }
 
+    @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;
 
-- 
cgit v1.2.3


From 2c46e4d1f4265303c502c3f75432a54b5f66e32b Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 24 Jul 2014 16:57:25 +0200
Subject: Search for correct properties in Server tree for subscription

---
 src/main/java/com/c2kernel/entity/proxy/ProxyManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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 {
-- 
cgit v1.2.3