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)

3 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
index baea8dd..10e5e6f 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
@@ -32,11 +32,11 @@ public class NewAgent extends ModuleImport implements java.io.Serializable {
     }

 

 	public void create(int agentId) throws ObjectNotFoundException, ObjectCannotBeUpdated, NoSuchAlgorithmException, CannotManageException, ObjectAlreadyExistsException {

-        AgentPath newAgent = Gateway.getLDAPLookup().getNextKeyManager().generateNextAgentKey();

+        AgentPath newAgent = Gateway.getNextKeyManager().generateNextAgentKey();

         newAgent.setAgentName(name);

         newAgent.setPassword(password);

         ActiveEntity newAgentEnt = (ActiveEntity)Gateway.getCorbaServer().createEntity(newAgent);

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

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

         // assemble properties

         properties.add(new com.c2kernel.property.Property("Name", name, true));

         properties.add(new com.c2kernel.property.Property("Type", "Agent", false));

@@ -49,7 +49,7 @@ public class NewAgent extends ModuleImport implements java.io.Serializable {
         for (String role : roles) {

             RolePath thisRole;

             try {

-                thisRole = Gateway.getLDAPLookup().getRoleManager().getRolePath(role);

+                thisRole = Gateway.getLookup().getRolePath(role);

             } catch (ObjectNotFoundException ex) {

                 throw new ObjectNotFoundException("Role "+role+" does not exist.");

             }

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
index c0197db..b1ef0e4 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
@@ -77,9 +77,9 @@ public class NewItem extends ModuleImport {
         } 

         else {

 	        // create item

-	        entPath = Gateway.getLDAPLookup().getNextKeyManager().generateNextEntityKey();

+	        entPath = Gateway.getNextKeyManager().generateNextEntityKey();

 	        newItem = (TraceableEntity)Gateway.getCorbaServer().createEntity(entPath);

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

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

         }

         

         // set the name property

@@ -181,7 +181,7 @@ public class NewItem extends ModuleImport {
         // register domain path (before collections in case of recursive collections)

         if (!domPath.exists()) {

         	domPath.setEntity(entPath);

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

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

         }

     }

 }

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewRole.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewRole.java
index 003b7f7..74415a5 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewRole.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewRole.java
@@ -13,7 +13,7 @@ public class NewRole extends ModuleImport {
 	}

 	

 	public void create(int agentId) throws ObjectAlreadyExistsException, ObjectCannotBeUpdated {

-		Gateway.getLDAPLookup().getRoleManager().createRole(name, jobList);

+		Gateway.getLookup().createRole(name, jobList);

 	}

 

 }