LDAP refactored behind interfaces. All functions of LDAP now hidden

behind interfaces: Authenticator, Lookup and NextKeyManager (LDAP
property storage was already a ClusterStorage). Gateway holds additional
objects, and 
Fixes #26 #191. Refs #27 (needs additional work for read perms and auth
tokens)

1 files changed, 9 insertions, 3 deletions

diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java
index 0afe3af..6a69ff8 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleManager.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java
@@ -9,6 +9,7 @@ import java.util.Properties;
 

 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.entity.proxy.AgentProxy;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.lookup.DomainPath;

 import com.c2kernel.persistency.outcome.OutcomeValidator;

@@ -22,6 +23,7 @@ public class ModuleManager {
 	ArrayList<Module> modules = new ArrayList<Module>();

 	HashMap<String, String> modulesXML = new HashMap<String, String>();

 	Properties props = new Properties();

+	AgentProxy user;

 	boolean isServer;

 	OutcomeValidator moduleValidator;

 

@@ -110,6 +112,10 @@ public class ModuleManager {
 		if (!allDepsPresent) Logger.die("Unmet module dependencies. Cannot continue");

 	}

 

+	public void setUser(AgentProxy user) {

+		this.user = user;

+	}

+

 	public String getModuleVersions() {

 		StringBuffer ver = new StringBuffer();

 		for (Module thisMod : modules) {

@@ -127,7 +133,7 @@ public class ModuleManager {
 	public void runScripts(String event) {

 		for (Module thisMod : modules) {

 			try {

-				thisMod.runScript(event, isServer);

+				thisMod.runScript(event, user, isServer);

 			} catch (ScriptingEngineException e) {

 				Logger.error(e);

 				Logger.die(e.getMessage());

@@ -152,7 +158,7 @@ public class ModuleManager {
 			try {

 				String nsReset = Gateway.getProperties().getProperty("Module."+thisMod.ns+".reset");

 				boolean thisReset = nsReset == null?reset:nsReset.equals("true");

-				thisMod.importAll(serverEntity, modulesXML.get(thisMod.ns), thisReset);

+				thisMod.importAll(serverEntity, user, modulesXML.get(thisMod.ns), thisReset);

 			} catch (Exception e) {

 				Logger.error(e);

 				throw new ModuleException("Error importing items for module "+thisMod.getName());

@@ -160,7 +166,7 @@ public class ModuleManager {
 			Logger.msg("Module "+thisMod.getName()+" registered");

 			

 			try {

-				thisMod.runScript("startup", true);

+				thisMod.runScript("startup", user, true);

 			} catch (ScriptingEngineException e) {

 				Logger.error(e);

 				throw new ModuleException("Error in startup script for module "+thisMod.getName());