Agent now extends Item, so they can have workflows. All traces of the

old 'Entity' superclasses should be removed, including proxies and
paths. Very large change, breaks API compatibility with CRISTAL 2.x.
Fixes #135

1 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java
index ea49ded..6c7b68d 100644
--- a/src/main/java/com/c2kernel/process/Gateway.java
+++ b/src/main/java/com/c2kernel/process/Gateway.java
@@ -13,7 +13,7 @@ import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.CorbaServer;

 import com.c2kernel.entity.proxy.AgentProxy;

-import com.c2kernel.entity.proxy.EntityProxyManager;

+import com.c2kernel.entity.proxy.ProxyManager;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.LDAPLookup;

 import com.c2kernel.lookup.LDAPProperties;

@@ -57,7 +57,7 @@ public class Gateway
     static private boolean				orbDestroyed = false;

     static private LDAPLookup           mLDAPLookup;

     static private TransactionManager   mStorage;

-    static private EntityProxyManager   mProxyManager;

+    static private ProxyManager   mProxyManager;

     static private CorbaServer          mCorbaServer;

     static private CastorXMLUtility		mMarshaller;

     static private AgentProxy			mCurrentUser = null;

@@ -151,7 +151,7 @@ public class Gateway
             mLDAPLookup.install();

 

             // start entity proxy server

-            EntityProxyManager.initServer();

+            ProxyManager.initServer();

 

             // Init ORB - set various config 

             String serverName = getProperty("ItemServer.name");

@@ -329,7 +329,7 @@ public class Gateway
 

         // Init storages

         mStorage = new TransactionManager();

-        mProxyManager = new EntityProxyManager();

+        mProxyManager = new ProxyManager();

 

     }

 

@@ -360,7 +360,7 @@ public class Gateway
         if (mProxyManager != null)

             mProxyManager.shutdown();

         mProxyManager = null;

-        EntityProxyManager.shutdownServer();

+        ProxyManager.shutdownServer();

 

         // close log consoles

         Logger.closeConsole();

@@ -405,7 +405,7 @@ public class Gateway
     	return mResource;

     }

 

-    static public EntityProxyManager getProxyManager()

+    static public ProxyManager getProxyManager()

     {

         return mProxyManager;

     }