6 files changed, 147 insertions, 34 deletions
diff --git a/cppe/include/IceE/Acceptor.h b/cppe/include/IceE/Acceptor.h
index 9ec75748fb1..e4831ed3851 100644
--- a/cppe/include/IceE/Acceptor.h
+++ b/cppe/include/IceE/Acceptor.h
@@ -10,13 +10,14 @@
 #ifndef ICEE_TRANSPORT_ACCEPTOR_H
 #define ICEE_TRANSPORT_ACCEPTOR_H
 
-#include <IceE/Shared.h>
 #include <IceE/TransceiverF.h>
 #include <IceE/InstanceF.h>
 #include <IceE/TraceLevelsF.h>
 #include <IceE/LoggerF.h>
 #include <IceE/AcceptorF.h>
 
+#include <IceE/Shared.h>
+
 #ifdef _WIN32
 typedef int ssize_t;
 #else
diff --git a/cppe/include/IceE/IceE.h b/cppe/include/IceE/IceE.h
index 5407a57a21b..5b22b9cb615 100644
--- a/cppe/include/IceE/IceE.h
+++ b/cppe/include/IceE/IceE.h
@@ -16,9 +16,11 @@
 #include <IceE/Logger.h>
 #include <IceE/LoggerUtil.h>
 #include <IceE/Communicator.h>
-#include <IceE/ObjectAdapter.h>
-#include <IceE/Proxy.h>
-#include <IceE/Object.h>
+#ifndef ICEE_PURE_CLIENT
+#  include <IceE/ObjectAdapter.h>
+#  include <IceE/Object.h>
+#endif
+#  include <IceE/Proxy.h>
 #include <IceE/IdentityUtil.h>
 #include <IceE/Connection.h>
 #include <IceE/Functional.h>
diff --git a/cppe/src/IceE/LocatorInfoF.h b/cppe/include/IceE/LocatorInfoF.h
index 14118fe4804..14118fe4804 100644
--- a/cppe/src/IceE/LocatorInfoF.h
+++ b/cppe/include/IceE/LocatorInfoF.h
diff --git a/cppe/include/IceE/ObjectAdapter.h b/cppe/include/IceE/ObjectAdapter.h
index f1a6256980d..8371a74d347 100755
--- a/cppe/include/IceE/ObjectAdapter.h
+++ b/cppe/include/IceE/ObjectAdapter.h
@@ -25,7 +25,7 @@
 #include <IceE/EndpointF.h>
 #include <IceE/RouterF.h>
 #include <IceE/LocatorF.h>
-//#include <IceE/LocatorInfoF.h>
+#include <IceE/LocatorInfoF.h>
 #include <IceE/FacetMap.h>
 #include <list>
 
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index f81fb61acfc..3764093e2c0 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -147,7 +147,7 @@ IceE::ObjectAdapter::activate()
 	}
 	catch(const AdapterAlreadyActiveException&)
 	{
-	    ObjectAdapterdInUseException ex(__FILE__, __LINE__);
+	    ObjectAdapterIdInUseException ex(__FILE__, __LINE__);
 	    ex.id = _id;
 	    throw ex;
 	}
diff --git a/cppe/src/IceEC/icec.dsp b/cppe/src/IceEC/icec.dsp
index d929fed1fea..b5826e3bcbc 100755
--- a/cppe/src/IceEC/icec.dsp
+++ b/cppe/src/IceEC/icec.dsp
@@ -258,6 +258,10 @@ SOURCE=..\IceE\LocalObject.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\Locator.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\IceE\LocatorInfo.cpp
 # End Source File
 # Begin Source File
@@ -318,14 +322,6 @@ SOURCE=..\IceE\ReferenceFactory.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\IceE\RouterInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\IceE\RoutingTable.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\IceE\RWRecMutex.cpp
 # End Source File
 # Begin Source File
@@ -546,6 +542,14 @@ SOURCE=..\..\include\IceE\LocalObjectF.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\IceE\Locator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\IceE\LocatorF.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\IceE\LocatorInfo.h
 # End Source File
 # Begin Source File
@@ -654,26 +658,6 @@ SOURCE=..\IceE\ReferenceFactoryF.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\IceE\RouterInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\IceE\RouterInfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\IceE\RouterInfoF.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IceE\RoutingTable.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\IceE\RoutingTableF.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\IceE\RWRecMutex.h
 # End Source File
 # Begin Source File
@@ -975,6 +959,132 @@ BuildCmds= \
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\slice\IceE\Locator.ice
+
+!IF  "$(CFG)" == "icec - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceE\Locator.ice
+
+BuildCmds= \
+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	move Locator.h ..\..\include\icee \
+	
+
+"..\..\include\icee\Locator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Locator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "icec - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceE\Locator.ice
+
+BuildCmds= \
+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	move Locator.h ..\..\include\icee \
+	
+
+"..\..\include\icee\Locator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Locator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "icec - Win32 Release Static"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceE\Locator.ice
+
+BuildCmds= \
+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	move Locator.h ..\..\include\icee \
+	
+
+"..\..\include\icee\Locator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Locator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "icec - Win32 Debug Static"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceE\Locator.ice
+
+BuildCmds= \
+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	move Locator.h ..\..\include\icee \
+	
+
+"..\..\include\icee\Locator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Locator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\IceE\LocatorF.ice
+
+!IF  "$(CFG)" == "icec - Win32 Release"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceE\LocatorF.ice
+
+"..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	move LocatorF.h ..\..\include\icee 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "icec - Win32 Debug"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceE\LocatorF.ice
+
+"..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	move LocatorF.h ..\..\include\icee 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "icec - Win32 Release Static"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceE\LocatorF.ice
+
+"..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	move LocatorF.h ..\..\include\icee 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "icec - Win32 Debug Static"
+
+# Begin Custom Build
+InputPath=..\..\slice\IceE\LocatorF.ice
+
+"..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	move LocatorF.h ..\..\include\icee 
+	
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\slice\IceE\Logger.ice
 
 !IF  "$(CFG)" == "icec - Win32 Release"