Expanded server predefined steps to include server and agent maintenance

steps. Fixes #174

1 files changed, 1 insertions, 7 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 305128b..0f3a246 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
@@ -20,9 +20,7 @@ import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.DomainPath;

 import com.c2kernel.lookup.EntityPath;

 import com.c2kernel.lookup.Path;

-import com.c2kernel.persistency.ClusterStorage;

 import com.c2kernel.process.Gateway;

-import com.c2kernel.property.Property;

 import com.c2kernel.utils.Logger;

 

 

@@ -48,12 +46,8 @@ public class Erase extends PredefinedStep
 

         try

         {

-            // FIXME: This should search for the entity key. Name shouldn't be unique.

-            // find entity name

-            Property name = (Property)Gateway.getStorage().get(itemSysKey, ClusterStorage.PROPERTY+"/Name", null);

-

             // get all domain paths

-            Enumeration<Path> domPaths = Gateway.getLDAPLookup().search(new DomainPath(), name.getValue());

+            Enumeration<Path> domPaths = Gateway.getLDAPLookup().searchAliases(new EntityPath(itemSysKey));

             while (domPaths.hasMoreElements()) {

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

                 // delete them