*** empty log message ***

7 files changed, 240 insertions, 223 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index cb912448d99..2af3d33da0b 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,24 @@
+Tue Apr 15 11:07:36 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* ciao/Daemon.idl:
+	* ciao/Daemon_Impl.h:
+	* ciao/Daemon_Impl.inl:
+	* ciao/Daemon_Impl.cpp:
+	* tools/Daemon/Daemon.idl:
+	* tools/Daemon/Daemon_Impl.h:
+	* tools/Daemon/Daemon_Impl.inl:
+	* tools/Daemon/Daemon_Impl.cpp:
+	* ciao/CCM_Core.mpc:
+	* ciao/CIAO_Server.dsp:
+	* tools/Daemon/CIAO_Daemon.dsp:
+	* tools/Daemon/Daemon.mpc:
+	* tools/Daemon/DaemonController.dsp: Moved Daemon idl file and
+	  implementations out of CIAO_Server library into Daemon
+	  implemenation.
+
+	* docs/todo.html:  Document other refactoring needed in the
+	  CCM_Core libraries.
+
 Mon Apr 14 17:06:37 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* examples/handcrafted/Display/HUDisplay_svnt.cpp:
diff --git a/TAO/CIAO/ciao/CCM_Core.mpc b/TAO/CIAO/ciao/CCM_Core.mpc
index 66a6c1c6c0f..90989f2a051 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -49,9 +49,9 @@ project (CIAO_Container) : taolib_with_idl {
 }
 
 project (CIAO_Server) :taolib_with_idl {
-  depends += CIAO_Container CosNaming
+  depends += CIAO_Container
   sharedname  = CIAO_Server
-  libs       += TAO TAO_PortableServer TAO_IFR_Client TAO_Security TAO_CosNaming
+  libs       += TAO TAO_PortableServer TAO_IFR_Client TAO_Security
   idlflags  += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs -Wb,export_include=CIAO_Server_Export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h"
 
   dllflags    = CIAO_SERVER_BUILD_DLL
@@ -60,8 +60,7 @@ project (CIAO_Server) :taolib_with_idl {
   IDL_Files {
     CCM_Deployment.idl
     CIAO_Servers.idl
-    Daemon.idl
-    HomeRegistrar.idl
+//    HomeRegistrar.idl
   }
 
   Source_Files {
@@ -69,16 +68,13 @@ project (CIAO_Server) :taolib_with_idl {
     CCM_DeploymentS.cpp
     CIAO_ServersC.cpp
     CIAO_ServersS.cpp
-    DaemonC.cpp
-    DaemonS.cpp
-    HomeRegistrarC.cpp
-    HomeRegistrarS.cpp
+//    HomeRegistrarC.cpp
+//    HomeRegistrarS.cpp
     ComponentInstallation_Impl.cpp
     ComponentServer_Impl.cpp
     Container_Base.cpp
     Container_Impl.cpp
-    Daemon_Impl.cpp
-    HomeRegistrar_i.cpp
+//    HomeRegistrar_i.cpp
     Server_init.cpp
     ServerActivator_Impl.cpp
   }
diff --git a/TAO/CIAO/ciao/CIAO_Server.dsp b/TAO/CIAO/ciao/CIAO_Server.dsp
index 6c066031260..7091a4785ee 100644
--- a/TAO/CIAO/ciao/CIAO_Server.dsp
+++ b/TAO/CIAO/ciao/CIAO_Server.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 ace.lib tao.lib TAO_IFR_Client.lib CIAO_Client.lib CIAO_Container.lib TAO_Security.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\CIAO_Server.dll" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\IFR_Client" /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\tao\PortableServer"

+# ADD LINK32 ace.lib tao.lib TAO_IFR_Client.lib CIAO_Client.lib CIAO_Container.lib TAO_Security.lib TAO_PortableServer.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\CIAO_Server.dll" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\IFR_Client" /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "CIAO_Server - Win32 Debug"

 

@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib TAO_IFR_Clientd.lib CIAO_Clientd.lib CIAO_Containerd.lib TAO_Securityd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\CIAO_Serverd.dll" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\IFR_Client" /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\tao\PortableServer"

+# ADD LINK32 aced.lib taod.lib TAO_IFR_Clientd.lib CIAO_Clientd.lib CIAO_Containerd.lib TAO_Securityd.lib TAO_PortableServerd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\CIAO_Serverd.dll" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\IFR_Client" /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\tao\PortableServer"

 

 !ENDIF 

 

@@ -124,30 +124,6 @@ SOURCE=.\Container_Impl.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Daemon_Impl.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DaemonC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DaemonS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\HomeRegistrar_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\HomeRegistrarC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\HomeRegistrarS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Server_init.cpp

 # End Source File

 # Begin Source File

@@ -192,30 +168,6 @@ SOURCE=.\Container_Impl.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Daemon_Impl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DaemonC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DaemonS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\HomeRegistrar_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\HomeRegistrarC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\HomeRegistrarS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Server_init.h

 # End Source File

 # Begin Source File

@@ -360,136 +312,6 @@ BuildCmds= \
 !ENDIF 

 

 # End Source File

-# Begin Source File

-

-SOURCE=.\Daemon.idl

-

-!IF  "$(CFG)" == "CIAO_Server - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputName)

-InputPath=.\Daemon.idl

-InputName=Daemon

-

-BuildCmds= \

-	..\..\..\bin\release\tao_idl -Ge 1 -Sc -I ../.. -I ../../orbsvcs/orbsvcs -Wb,export_macro=CIAO_SERVER_Export -Wb,export_include=CIAO_SERVER_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "CIAO_Server - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputName)

-InputPath=.\Daemon.idl

-InputName=Daemon

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Sc -I ../.. -I ../../orbsvcs/orbsvcs -Wb,export_macro=CIAO_SERVER_Export -Wb,export_include=CIAO_SERVER_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\HomeRegistrar.idl

-

-!IF  "$(CFG)" == "CIAO_Server - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputName)

-InputPath=.\HomeRegistrar.idl

-InputName=HomeRegistrar

-

-BuildCmds= \

-	..\..\..\bin\release\tao_idl -Ge 1 -Sc -I ../.. -I ../../orbsvcs/orbsvcs -Wb,export_macro=CIAO_SERVER_Export -Wb,export_include=CIAO_SERVER_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "CIAO_Server - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputName)

-InputPath=.\HomeRegistrar.idl

-InputName=HomeRegistrar

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Sc -I ../.. -I ../../orbsvcs/orbsvcs -Wb,export_macro=CIAO_SERVER_Export -Wb,export_include=CIAO_SERVER_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

 # End Group

 # Begin Group "Inline Files"

 

@@ -528,30 +350,6 @@ SOURCE=.\Container_Impl.inl
 # End Source File

 # Begin Source File

 

-SOURCE=.\Daemon_Impl.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\DaemonC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DaemonS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\HomeRegistrar_i.inl

-# End Source File

-# Begin Source File

-

-SOURCE=.\HomeRegistrarC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\HomeRegistrarS.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\ServerActivator_Impl.inl

 # End Source File

 # End Group

diff --git a/TAO/CIAO/tools/Daemon/CIAO_Daemon.dsp b/TAO/CIAO/tools/Daemon/CIAO_Daemon.dsp
index 5a381df4373..702d5083621 100644
--- a/TAO/CIAO/tools/Daemon/CIAO_Daemon.dsp
+++ b/TAO/CIAO/tools/Daemon/CIAO_Daemon.dsp
@@ -7,19 +7,19 @@
 CFG=CIAO_Daemon - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "CIAO_Daemon.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "CIAO_Daemon.mak" CFG="CIAO_Daemon - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "CIAO_Daemon - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "CIAO_Daemon - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -74,9 +74,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib TAO_IFR_Clientd.lib CIAO_Containerd.lib CIAO_Clientd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_Securityd.lib TAO_CosNamingd.lib  TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\IFR_Client" /libpath:"..\..\ciao" /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao\IORTable"

+# ADD LINK32 aced.lib taod.lib TAO_IFR_Clientd.lib CIAO_Containerd.lib CIAO_Clientd.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_Securityd.lib TAO_CosNamingd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\IFR_Client" /libpath:"..\..\ciao" /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao\IORTable"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -89,14 +89,125 @@ LINK32=link.exe
 

 SOURCE=.\CIAO_Daemon.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\Daemon_Impl.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DaemonC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\DaemonS.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Daemon_Impl.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DaemonC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\DaemonS.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

 # End Group

+# Begin Group "IDL Files"

+

+# PROP Default_Filter "idl"

+# Begin Source File

+

+SOURCE=.\Daemon.idl

+

+!IF  "$(CFG)" == "CIAO_Daemon - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

+OutDir=.

+InputPath=.\Daemon.idl

+InputName=Daemon

+

+BuildCmds= \

+	..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\.. -I..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\.. -I ..\..\.. -I ..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)

+

+"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "CIAO_Daemon - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

+OutDir=.

+InputPath=.\Daemon.idl

+InputName=Daemon

+

+BuildCmds= \

+	..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\.. -I..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\.. -I ..\..\.. -I ..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)

+

+"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i;inl"

+# Begin Source File

+

+SOURCE=.\Daemon_Impl.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\DaemonC.i

+# End Source File

+# Begin Source File

+

+SOURCE=.\DaemonS.i

+# End Source File

+# End Group

 # End Target

 # End Project

diff --git a/TAO/CIAO/tools/Daemon/Daemon.mpc b/TAO/CIAO/tools/Daemon/Daemon.mpc
index a6fe27e7e31..6d745673dc7 100644
--- a/TAO/CIAO/tools/Daemon/Daemon.mpc
+++ b/TAO/CIAO/tools/Daemon/Daemon.mpc
@@ -3,14 +3,26 @@ project(CIAO_Daemon): ciao_server {
   libs += TAO_IORTable
   libpaths += $(TAO_ROOT)/tao/IORTable
 
+  IDL_Files {
+    Daemon.idl
+  }
+
   Source_Files {
+    DaemonC.cpp
+    DaemonS.cpp
+    Daemon_Impl.cpp
     CIAO_Daemon.cpp
   }
 }
 
 project(DaemonController) : ciao_server, acexml {
 
+  IDL_Files {
+    Daemon.idl
+  }
+
   Source_Files {
+    DaemonC.cpp
     DaemonController.cpp
     controller_i.cpp
     Daemon_Commands.cpp
diff --git a/TAO/CIAO/tools/Daemon/DaemonController.dsp b/TAO/CIAO/tools/Daemon/DaemonController.dsp
index 8b2996a3f9c..fbcd930815d 100644
--- a/TAO/CIAO/tools/Daemon/DaemonController.dsp
+++ b/TAO/CIAO/tools/Daemon/DaemonController.dsp
@@ -95,6 +95,10 @@ SOURCE=.\Daemon_Commands.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\DaemonC.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\DaemonController.cpp

 # End Source File

 # Begin Source File

@@ -167,6 +171,10 @@ SOURCE=.\Daemon_Commands.inl
 # End Source File

 # Begin Source File

 

+SOURCE=.\DaemonC.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\Softpkg_Commands.inl

 # End Source File

 # Begin Source File

@@ -178,5 +186,76 @@ SOURCE=..\XML_Helpers\Softpkg_Handlers.inl
 SOURCE=..\XML_Helpers\XML_Utils.inl

 # End Source File

 # End Group

+# Begin Group "IDL FIles"

+

+# PROP Default_Filter "idl"

+# Begin Source File

+

+SOURCE=.\Daemon.idl

+

+!IF  "$(CFG)" == "DaemonController EXE - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

+OutDir=.\Release

+InputPath=.\Daemon.idl

+InputName=Daemon

+

+BuildCmds= \

+	..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\.. -I..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\.. -I ..\..\.. -I ..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)

+

+"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "DaemonController EXE - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

+OutDir=.

+InputPath=.\Daemon.idl

+InputName=Daemon

+

+BuildCmds= \

+	..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\.. -I..\..\..\CIAO\ciao -Wb,pre_include="ace\pre.h" -Wb,post_include="ace\post.h" -I ..\.. -I ..\..\.. -I ..\..\..\orbsvcs\orbsvcs -Ge 1 -Sc $(InputPath)

+

+"$(OutDir)\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Group

 # End Target

 # End Project

diff --git a/TAO/CIAO/tools/Daemon/Daemon_Impl.h b/TAO/CIAO/tools/Daemon/Daemon_Impl.h
index 4ec597f6359..a9cf15fa40a 100644
--- a/TAO/CIAO/tools/Daemon/Daemon_Impl.h
+++ b/TAO/CIAO/tools/Daemon/Daemon_Impl.h
@@ -38,7 +38,7 @@ namespace CIAO
    * This class implements the CIAO:Daemon interface.  We use this interface
    * to acquire the
    */
-  class CIAO_SERVER_Export Daemon_Impl
+  class Daemon_Impl
     : public virtual POA_CIAO::Daemon,
       public virtual PortableServer::RefCountServantBase
   {