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)

5 files changed, 9 insertions, 11 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
index 7595711..a931143 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
@@ -35,7 +35,7 @@ public class AddDomainContext extends PredefinedStep {
 		while(!pathsToAdd.empty()) {

 			pathToAdd = pathsToAdd.pop();

 			try {

-				Gateway.getLDAPLookup().add(pathToAdd);

+				Gateway.getLookup().add(pathToAdd);

 			} catch (ObjectAlreadyExistsException e) {

 				Logger.error("Context "+pathToAdd+" inconsistently exists.");

 			} catch (ObjectCannotBeUpdated e) {

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveAgent.java
index 75fe80b..19641fe 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveAgent.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveAgent.java
@@ -25,7 +25,7 @@ public class RemoveAgent extends PredefinedStep {
 		String[] params = getDataList(requestData);

 		AgentPath targetAgent;

 		try {

-			targetAgent = Gateway.getLDAPLookup().getRoleManager().getAgentPath(params[0]);

+			targetAgent = Gateway.getLookup().getAgentPath(params[0]);

 		} catch (ObjectNotFoundException e) {

 			throw new InvalidDataException("Agent "+params[0]+" not found", "");

 		}

@@ -50,7 +50,7 @@ public class RemoveAgent extends PredefinedStep {
 		}

         //remove entity path

         try {

-			Gateway.getLDAPLookup().delete(targetAgent);

+			Gateway.getLookup().delete(targetAgent);

 		} catch (ObjectCannotBeUpdated e) {

 			throw new InvalidDataException("Error deleting AgentPath for  "+params[0], "");

 		}

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
index 77a7545..a55f7dd 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
@@ -27,11 +27,11 @@ public class RemoveDomainContext extends PredefinedStep {
 			pathToDelete.getEntity();

 			throw new InvalidDataException("Path "+pathToDelete+" is an Entity. Use its own Erase step instead, or RemoveAgent.", "");

 		} catch (ObjectNotFoundException ex) { }

-		if (pathToDelete.getChildren().hasMoreElements())

+		if (Gateway.getLookup().getChildren(pathToDelete).hasNext())

 			throw new InvalidDataException("Context "+pathToDelete+" is not empty. Cannot delete.", "");

 		

 		try {

-			Gateway.getLDAPLookup().delete(pathToDelete);

+			Gateway.getLookup().delete(pathToDelete);

 		} catch (ObjectCannotBeUpdated e) {

 			Logger.error(e);

 			throw new InvalidDataException("Exception deleting path"+pathToDelete+": "+e.getMessage(), "");

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentPassword.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentPassword.java
index bb19030..8a2863a 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentPassword.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentPassword.java
@@ -27,13 +27,13 @@ public class SetAgentPassword extends PredefinedStep {
 			throw new InvalidDataException("Requires 2 params: agent name and new password", "");

 		AgentPath targetAgent;

 		try {

-			targetAgent = Gateway.getLDAPLookup().getRoleManager().getAgentPath(params[0]);

+			targetAgent = Gateway.getLookup().getAgentPath(params[0]);

 		} catch (ObjectNotFoundException e) {

 			throw new InvalidDataException("Agent "+params[0]+" not found", "");

 		}

 		

 		try {

-			Gateway.getLDAPLookup().getRoleManager().setAgentPassword(targetAgent, params[1]);

+			Gateway.getLookup().setAgentPassword(targetAgent, params[1]);

 		} catch (ObjectNotFoundException e) {

 			Logger.error(e);

             throw new InvalidDataException("Agent "+params[0]+" not found.", "");

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentRoles.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentRoles.java
index 51be40a..19c6bd8 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentRoles.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentRoles.java
@@ -6,7 +6,6 @@ import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

-import com.c2kernel.lookup.LDAPRoleManager;

 import com.c2kernel.lookup.RolePath;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

@@ -26,18 +25,17 @@ public class SetAgentRoles extends PredefinedStep {
 		String[] params = getDataList(requestData);

 		AgentPath targetAgent;

 		try {

-			targetAgent = Gateway.getLDAPLookup().getRoleManager().getAgentPath(params[0]);

+			targetAgent = Gateway.getLookup().getAgentPath(params[0]);

 		} catch (ObjectNotFoundException e) {

 			throw new InvalidDataException("Agent "+params[0]+" not found", "");

 		}

 		

-		LDAPRoleManager roleMan = Gateway.getLDAPLookup().getRoleManager();

 		RolePath[] currentRoles = targetAgent.getRoles();

 		ArrayList<RolePath> requestedRoles = new ArrayList<RolePath>();

 		if (params.length>1)

 			for (int i=1; i<params.length; i++)

 				try {

-					requestedRoles.add(roleMan.getRolePath(params[i]));

+					requestedRoles.add(Gateway.getLookup().getRolePath(params[i]));

 				} catch (ObjectNotFoundException e) {

 					throw new InvalidDataException("Role "+params[i]+" not found", "");

 				}