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

diff --git a/src/main/java/com/c2kernel/entity/CorbaServer.java b/src/main/java/com/c2kernel/entity/CorbaServer.java
index 4a129ae..3a01ed7 100644
--- a/src/main/java/com/c2kernel/entity/CorbaServer.java
+++ b/src/main/java/com/c2kernel/entity/CorbaServer.java
@@ -14,8 +14,8 @@ import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.entity.agent.ActiveEntity;

 import com.c2kernel.entity.agent.ActiveLocator;

 import com.c2kernel.lookup.AgentPath;

-import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.lookup.InvalidItemPathException;

+import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 import com.c2kernel.utils.SoftCache;

@@ -126,7 +126,7 @@ public class CorbaServer {
                 if (entity == null) {

                     Logger.msg(7, "Creating new servant for "+sysKey);

 

-                    Class<?> entityClass = Gateway.getLDAPLookup().getEntityClass(entityPath);

+                    Class<?> entityClass = Gateway.getLookup().getItemClass(entityPath);

 

                     if (entityClass == TraceableEntity.class) {

                         if (poa == null) poa = mItemPOA;

@@ -167,7 +167,7 @@ public class CorbaServer {
     public Servant createEntity(ItemPath entityPath) throws CannotManageException, ObjectAlreadyExistsException {

         try {

             if (entityPath == null)

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

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

         } catch (Exception ex) {

             Logger.error(ex);

             throw new CannotManageException("Cannot generate next entity key");