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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
index 412fe52..3c4a6a7 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
@@ -13,7 +13,7 @@ package com.c2kernel.lifecycle.instance.predefined;
 

 

 

-import java.util.Enumeration;

+import java.util.Iterator;

 

 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.lookup.AgentPath;

@@ -47,19 +47,19 @@ public class Erase extends PredefinedStep
         try

         {

             // get all domain paths

-            Enumeration<Path> domPaths = Gateway.getLDAPLookup().searchAliases(new ItemPath(itemSysKey));

-            while (domPaths.hasMoreElements()) {

-                DomainPath path = (DomainPath)domPaths.nextElement();

+            Iterator<Path> domPaths = Gateway.getLookup().searchAliases(new ItemPath(itemSysKey));

+            while (domPaths.hasNext()) {

+                DomainPath path = (DomainPath)domPaths.next();

                 // delete them

                 if (path.getSysKey() == itemSysKey)

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

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

             }

 

             //clear out all storages

             Gateway.getStorage().removeCluster(itemSysKey, "", null);

 

             //remove entity path

-            Gateway.getLDAPLookup().delete(new ItemPath(itemSysKey));

+            Gateway.getLookup().delete(new ItemPath(itemSysKey));

         }

         catch( Exception ex )

         {