Expanded server predefined steps to include server and agent maintenance

steps. Fixes #174
Fixed schema of CreateNewItem and CreateNewAgent.

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 84b1b78..c26d5b8 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
@@ -22,9 +22,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;

 

 

@@ -53,12 +51,8 @@ public class Erase extends PredefinedStep
         try

         {

             EntityPath entityPath = getItemEntityPath();

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

-            // find entity name

-            Property name = (Property)Gateway.getStorage().get(entityPath.getSysKey(), 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(entityPath.getSysKey()));

             while (domPaths.hasMoreElements()) {

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

                 // delete them