Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java
index d28fe3c..3da17e9 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java
@@ -13,9 +13,9 @@ package com.c2kernel.lifecycle.instance.predefined;
 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.lookup.EntityPath;

-import com.c2kernel.lookup.InvalidEntityPathException;

-import com.c2kernel.lookup.LDAPLookup;

+import com.c2kernel.lookup.InvalidItemPathException;

+import com.c2kernel.lookup.ItemPath;

+import com.c2kernel.lookup.Lookup;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 

@@ -32,20 +32,20 @@ public class AddDomainPath extends PredefinedStep
 			int transitionID, String requestData) throws InvalidDataException {

     	

         Logger.msg(8,"AddAlias::request()");

-        LDAPLookup lookupManager = Gateway.getLDAPLookup();

+        Lookup lookupManager = Gateway.getLookup();

 

         Logger.msg(1,"AddAlias::request() - Starting.");

 

 

         try

         {

-            DomainPath domainPath = new DomainPath(getDataList(requestData)[0], new EntityPath(itemSysKey));

+            DomainPath domainPath = new DomainPath(getDataList(requestData)[0], new ItemPath(itemSysKey));

             lookupManager.add(domainPath);

             Logger.msg(8,"AddDomainPath::request() - systemKey:" + itemSysKey +

                             ". Adding dompath. DONE.");

             return requestData;

         }

-        catch (InvalidEntityPathException ex)

+        catch (InvalidItemPathException ex)

         {

             Logger.error(ex);

             throw new InvalidDataException(ex.toString(), "");