Initial Interface creation. Some compilation problems remain.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java
index 0d22cb3..b4e192c 100644
--- a/src/main/java/com/c2kernel/process/Bootstrap.java
+++ b/src/main/java/com/c2kernel/process/Bootstrap.java
@@ -22,7 +22,7 @@ import com.c2kernel.lifecycle.instance.stateMachine.Transitions;
 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.DomainPath;

 import com.c2kernel.lookup.EntityPath;

-import com.c2kernel.lookup.LDAPLookup;

+import com.c2kernel.lookup.Lookup;

 import com.c2kernel.lookup.Path;

 import com.c2kernel.lookup.RolePath;

 import com.c2kernel.persistency.ClusterStorage;

@@ -114,7 +114,7 @@ public class Bootstrap
                 

      public static void verifyResource(String ns, String itemName, String itemType, String data) throws Exception {

             Logger.msg(1, "Bootstrap.verifyResource() - Verifying data of "+getDataType(itemType)+" "+itemName);

-            Enumeration<Path> en = Gateway.getLDAPLookup().search(getTypeRoot(itemType), itemName);

+            Enumeration<Path> en = Gateway.getLookup().search(getTypeRoot(itemType), itemName);

             ItemProxy thisProxy;

             Outcome newOutcome = new Outcome(0, data, getDataType(itemType), 0);

 

@@ -183,16 +183,16 @@ public class Bootstrap
         	ca = (CompositeActivity) ((CompositeActivityDef)LocalObjectLoader.getActDef(wf, "last")).instantiate();

         }

 

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

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

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

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

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

         newItem.initialise(

                 1,

                 Gateway.getMarshaller().marshall(props),

                 Gateway.getMarshaller().marshall(ca));

         DomainPath newDomPath = new DomainPath(getTypeRoot(itemType).toString()+"/system/"+(ns==null?"kernel":ns)+"/"+itemName);

         newDomPath.setEntity(entityPath);

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

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

         return (ItemProxy)Gateway.getProxyManager().getProxy(entityPath);

     }

 

@@ -224,7 +224,7 @@ public class Bootstrap
      **************************************************************************/

      private static void checkAgent(String name, String pass, String role, boolean joblist) throws Exception {

          Logger.msg(1, "Bootstrap.checkAgent() - Checking for existence of '"+name+"' user.");

-         LDAPLookup lookup = Gateway.getLDAPLookup();

+         Lookup lookup = Gateway.getLookup();

          try {

              lookup.getRoleManager().getAgentPath(name);

              Logger.msg(3, "Bootstrap.checkAgent() - User '"+name+"' found.");

@@ -244,7 +244,7 @@ public class Bootstrap
              AgentPath agentPath = new AgentPath(entityPath.getSysKey(), name);

              agentPath.setPassword(pass);

              Gateway.getCorbaServer().createEntity(agentPath);

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

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

 

              // assign admin role

              Logger.msg("Bootstrap.checkAgent() - Assigning role '"+role+"'");

@@ -282,11 +282,11 @@ public class Bootstrap
             serverEntity = thisServerPath.getEntity();

         } catch (ObjectNotFoundException ex) {

             Logger.msg("Creating server item "+thisServerPath);

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

+            serverEntity = Gateway.getLookup().getNextKeyManager().generateNextEntityKey();

             Gateway.getCorbaServer().createEntity(serverEntity);

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

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

             thisServerPath.setEntity(serverEntity);

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

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

         }

         Gateway.getStorage().put(serverEntity.getSysKey(), new Property("Name", serverName), null);

         Gateway.getStorage().put(serverEntity.getSysKey(), new Property("Type", "Server"), null);

@@ -306,7 +306,7 @@ public class Bootstrap
         PredefinedStepContainer predef = (PredefinedStepContainer)wf.search("workflow/predefined");

         wf.getChildGraphModel().removeVertex(predef);

         wf.addChild(new ServerPredefinedStepContainer(), predef.getCentrePoint());

-        wf.initialise(thisServerPath.getSysKey(), Gateway.getLDAPLookup().getRoleManager().getAgentPath("system"));

+        wf.initialise(thisServerPath.getSysKey(), Gateway.getLookup().getRoleManager().getAgentPath("system"));

         Gateway.getStorage().put(thisServerPath.getSysKey(), wf, null);

     }

 }