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, 7 insertions, 6 deletions

diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java
index 2c182ea..dae5711 100644
--- a/src/main/java/com/c2kernel/process/module/Module.java
+++ b/src/main/java/com/c2kernel/process/module/Module.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Properties;

 

 import com.c2kernel.common.ObjectNotFoundException;

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

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.lifecycle.instance.predefined.entitycreation.Dependency;

 import com.c2kernel.lifecycle.instance.predefined.entitycreation.DependencyMember;

@@ -33,11 +34,11 @@ public class Module {
 		super();

 	}

 	

-	public void runScript(String event, boolean isServer) throws ScriptingEngineException {

+	public void runScript(String event, AgentProxy user, boolean isServer) throws ScriptingEngineException {

 		for (ModuleScript script : scripts) {

 			if (script.shouldRun(event, isServer)) {

 				Logger.msg("Running "+script.event+" "+script.target+" script from "+name);

-				Object result = script.getScript(ns).execute();

+				Object result = script.getScript(ns, user).execute();

 				if (result instanceof ErrorInfo) {

 					ErrorInfo error = (ErrorInfo) result;

 					Logger.error(error.toString());

@@ -73,9 +74,9 @@ public class Module {
 		imports.list.add(moduleItem);

 	}

 	

-	public void importAll(ItemProxy serverEntity, String moduleXML, boolean reset) throws Exception {

+	public void importAll(ItemProxy serverEntity, AgentProxy systemAgent, String moduleXML, boolean reset) throws Exception {

+		int systemAgentId = systemAgent.getSystemKey();

 		addModuleItem(moduleXML);

-		int systemAgentId = Gateway.getLDAPLookup().getRoleManager().getAgentPath("system").getSysKey();

 		

 		for (ModuleResource thisRes : imports.getResources()) {

 			try {

@@ -89,7 +90,7 @@ public class Module {
 		for (NewRole thisRole : imports.getRoles()) {

 			RolePath rolePath;

 			try {

-				rolePath = Gateway.getLDAPLookup().getRoleManager().getRolePath(thisRole.name);

+				rolePath = Gateway.getLookup().getRolePath(thisRole.name);

 				if (rolePath.hasJobList() != thisRole.jobList) {

 					Logger.msg("Module.importAll() - Role '"+thisRole.name+"' has incorrect joblist settings. Correcting.");

 					rolePath.setHasJobList(thisRole.jobList);

@@ -102,7 +103,7 @@ public class Module {
 		

 		for (NewAgent thisAgent : imports.getAgents()) {

 			try {

-				Gateway.getLDAPLookup().getRoleManager().getAgentPath(thisAgent.name);

+				Gateway.getLookup().getAgentPath(thisAgent.name);

 			    Logger.msg(3, "Module.importAll() - User '"+thisAgent.name+"' found.");

 			    continue;

 			 } catch (ObjectNotFoundException ex) { }