ChangeLogTag: Tue Aug 05 17:25:45 2003 George Edwards <g.edwards@vanderbilt.edu>

10 files changed, 72 insertions, 40 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index fcbfc0ae381..b4244571188 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,15 +1,37 @@
-Tue Aug 05 13:23:12 2003  George Edwards <g.edwards@vanderbilt.edu>
+Tue Aug 05 17:25:45 2003  George Edwards <g.edwards@vanderbilt.edu>
+
+        * examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc:
+        * examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc:
+        * examples/handcrafted/BasicSP_EC2/EC/EC.mpc:
+        * examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc:
+        * examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService.mpc:
+        * examples/handcrafted/BasicSP_EC2/BasicSP.mpc:
+
+        Added library include paths and additional library to MPC files.
+
+        Removed file:
+        * examples/handcrafted/BasicSP_EC2/EC/config:
 
-       Added files:
-       * examples/handcrafted/BasicSP_EC2/*.*:
-       * examples/handcrafted/BasicSP_EC2/BMClosedED/*.*:
-       * examples/handcrafted/BasicSP_EC2/BMDevice/*.*:
-       * examples/handcrafted/BasicSP_EC2/EC/*.*:
-       * examples/handcrafted/BasicSP_EC2/descriptors/*.*:
-       * examples/handcrafted/BasicSP_EC2/BMDisplay/*.*:
+        Removed unnecessary file.
+
+        * examples/handcrafted/BasicSP_EC2/EC/controller.cpp:
+        * examples/handcrafted/BasicSP_EC2/EC/client.cpp:
+
+        Included ace/Streams.h.
+
+Tue Aug 05 13:23:12 2003  George Edwards <g.edwards@vanderbilt.edu>
 
-       Added new event channel example. The event service is
-       integrated as a separate component.
+        Added files:
+        * examples/handcrafted/BasicSP_EC2/*.*:
+        * examples/handcrafted/BasicSP_EC2/BMClosedED/*.*:
+        * examples/handcrafted/BasicSP_EC2/BMDevice/*.*:
+        * examples/handcrafted/BasicSP_EC2/EC/*.*:
+        * examples/handcrafted/BasicSP_EC2/descriptors/*.*:
+        * examples/handcrafted/BasicSP_EC2/BMDisplay/*.*:
+        * examples/handcrafted/BasicSP_EC2/RTEventService/*.*:
+
+        Added new event channel example. The event service is
+        integrated as a separate component.
 
 2003-08-04  Arvind S. Krishna  <arvindk@equus.dre.vanderbilt.edu>
 
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc
index 014268adf82..51a7c0bc99b 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMClosedED/BMClosedED.mpc
@@ -5,8 +5,10 @@
 project(BMClosedED_stub): ciao_client {
   after += BasicSP_stub
   sharedname = BMClosedED_stub
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h
   dynamicflags   = BMCLOSEDED_STUB_BUILD_DLL
+  libs +=  TAO_RTEvent
 
   IDL_Files {
     BMClosedED.idl
@@ -20,8 +22,8 @@ project(BMClosedED_stub): ciao_client {
 project(BMClosedED_svnt) : ciao_servant {
   after += BasicSP_svnt BMClosedED_stub
   sharedname  = BMClosedED_svnt
-  libs    += BMClosedED_stub BasicSP_stub BasicSP_svnt
-  libpaths += ..
+  libs    += BMClosedED_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export -Wb,export_include=BMClosedED_svnt_export.h
   dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL
 
@@ -44,8 +46,8 @@ project(BMClosedED_svnt) : ciao_servant {
 project(BMClosedED_exec) : ciao_component {
   after   += BMClosedED_svnt
   sharedname = BMClosedED_exec
-  libs      += BMClosedED_stub BMClosedED_svnt BasicSP_stub BasicSP_svnt
-  libpaths += ..
+  libs      += BMClosedED_stub BMClosedED_svnt BasicSP_stub BasicSP_svnt TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags  +=  -Wb,export_macro=BMCLOSEDED_EXEC_Export -Wb,export_include=BMClosedED_exec_export.h
   dynamicflags   = BMCLOSEDED_EXEC_BUILD_DLL
 
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc
index 2c618860cb9..793ede6c890 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDevice/BMDevice.mpc
@@ -5,8 +5,8 @@ project(BMDevice_stub): ciao_client {
   sharedname = BMDevice_stub
 
   idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h
-  libpaths += ..
-  libs += BasicSP_stub
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
+  libs += BasicSP_stub TAO_RTEvent
   dynamicflags   = BMDEVICE_STUB_BUILD_DLL
 
   IDL_Files {
@@ -21,8 +21,8 @@ project(BMDevice_stub): ciao_client {
 project(BMDevice_svnt) : ciao_servant {
   after += BMDevice_stub BasicSP_stub
   sharedname  = BMDevice_svnt
-  libs    += BMDevice_stub BasicSP_stub BasicSP_svnt
-  libpaths += ..
+  libs    += BMDevice_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags  +=  -Wb,export_macro=BMDEVICE_SVNT_Export -Wb,export_include=BMDevice_svnt_export.h
   dynamicflags = BMDEVICE_SVNT_BUILD_DLL
 
@@ -45,8 +45,8 @@ project(BMDevice_svnt) : ciao_servant {
 project(BMDevice_exec) : ciao_component {
   after += BMDevice_svnt
   sharedname = BMDevice_exec
-  libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt
-  libpaths += ..
+  libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags  +=  -Wb,export_macro=BMDEVICE_EXEC_Export -Wb,export_include=BMDevice_exec_export.h
   dynamicflags   = BMDEVICE_EXEC_BUILD_DLL
 
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc
index 5c0a113b9c8..e8bfc8e9c50 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BMDisplay/BMDisplay.mpc
@@ -4,8 +4,10 @@
 project(BMDisplay_stub): ciao_client {
   after += BasicSP_stub
   sharedname = BMDisplay_stub
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h
   dynamicflags   = BMDISPLAY_STUB_BUILD_DLL
+  libs += TAO_RTEvent
 
   IDL_Files {
     BMDisplay.idl
@@ -19,8 +21,8 @@ project(BMDisplay_stub): ciao_client {
 project(BMDisplay_svnt) : ciao_servant {
   after += BasicSP_svnt BMDisplay_stub
   sharedname  = BMDisplay_svnt
-  libs    += BMDisplay_stub BasicSP_stub BasicSP_svnt
-  libpaths += ..
+  libs    += BMDisplay_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export -Wb,export_include=BMDisplay_svnt_export.h
   dynamicflags = BMDISPLAY_SVNT_BUILD_DLL
 
@@ -43,8 +45,8 @@ project(BMDisplay_svnt) : ciao_servant {
 project(BMDisplay_exec) : ciao_component {
   after += BMDisplay_svnt
   sharedname = BMDisplay_exec
-  libs      += BMDisplay_stub BMDisplay_svnt BasicSP_stub BasicSP_svnt
-  libpaths += ..
+  libs      += BMDisplay_stub BMDisplay_svnt BasicSP_stub BasicSP_svnt TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags  +=  -Wb,export_macro=BMDISPLAY_EXEC_Export -Wb,export_include=BMDisplay_exec_export.h
   dynamicflags   = BMDISPLAY_EXEC_BUILD_DLL
 
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BasicSP.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BasicSP.mpc
index f58c9efe005..80eb6b1307d 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BasicSP.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/BasicSP.mpc
@@ -6,6 +6,8 @@ project(BasicSP_stub): ciao_client {
   sharedname = BasicSP_stub
   idlflags += -Wb,stub_export_macro=BASICSP_STUB_Export -Wb,stub_export_include=BasicSP_stub_export.h -Wb,skel_export_macro=BASICSP_SVNT_Export -Wb,skel_export_include=BasicSP_svnt_export.h
   dynamicflags   = BASICSP_STUB_BUILD_DLL
+  libpaths += ..\..\..\..\..\lib,..\..\..\..\tao\IFR_Client,..\..\..\..\tao\Valuetype,..\..\..\..\tao,..\..\..\..\..\ace,..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\tao\PortableServer,..\..\..\..\tao\IORInterceptor,..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\ACEXML\common,..\..\..\..\tao\IORTable
+  libs += TAO_RTEvent
 
   IDL_Files {
     BasicSP.idl
@@ -19,7 +21,8 @@ project(BasicSP_stub): ciao_client {
 project(BasicSP_svnt) : ciao_server {
   after +=  BasicSP_stub
   sharedname = BasicSP_svnt
-  libs    += BasicSP_stub
+  libs    += BasicSP_stub TAO_RTEvent
+  libpaths += ..\..\..\..\..\lib,..\..\..\..\tao\IFR_Client,..\..\..\..\tao\Valuetype,..\..\..\..\tao,..\..\..\..\..\ace,..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\tao\PortableServer,..\..\..\..\tao\IORInterceptor,..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\ACEXML\common,..\..\..\..\tao\IORTable
 
   idlflags  +=  -Wb,export_macro=BASICSP_SVNT_Export -Wb,export_include=BasicSP_svnt_export.h
   dynamicflags = BASICSP_SVNT_BUILD_DLL
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC.mpc
index b5d7a251536..1665b63eadc 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/EC.mpc
@@ -4,8 +4,10 @@
 project(EC_stub): ciao_client {
   after += BasicSP_stub
   sharedname = EC_stub
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags += -Wb,stub_export_macro=EC_STUB_Export -Wb,stub_export_include=EC_stub_export.h -Wb,skel_export_macro=EC_SVNT_Export -Wb,skel_export_include=EC_svnt_export.h
   dynamicflags   = EC_STUB_BUILD_DLL
+  libs += TAO_RTEvent
 
   IDL_Files {
     EC.idl
@@ -19,8 +21,8 @@ project(EC_stub): ciao_client {
 project(EC_svnt) : ciao_servant {
   after += BasicSP_svnt EC_stub
   sharedname  = EC_svnt
-  libs    += EC_stub BasicSP_stub BasicSP_svnt
-  libpaths += ..
+  libs    += EC_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags  +=  -Wb,export_macro=EC_SVNT_Export -Wb,export_include=EC_svnt_export.h
   dynamicflags = EC_SVNT_BUILD_DLL
 
@@ -43,8 +45,8 @@ project(EC_svnt) : ciao_servant {
 project(EC_exec) : ciao_component {
   after += EC_svnt
   sharedname = EC_exec
-  libs      += EC_stub BasicSP_stub EC_svnt
-  libpaths += ..
+  libs      += EC_stub BasicSP_stub EC_svnt TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags  +=  -Wb,export_macro=EC_EXEC_Export -Wb,export_include=EC_exec_export.h
   dynamicflags   = EC_EXEC_BUILD_DLL
 
@@ -63,8 +65,8 @@ project(EC_exec) : ciao_component {
 project (EC_client) : ciao_client, valuetype {
   exename = client
   after += EC_stub
-  libs += EC_stub BasicSP_stub
-  libpaths += ..
+  libs += EC_stub BasicSP_stub TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
 
   IDL_Files {
   }
@@ -78,8 +80,8 @@ project (EC_client) : ciao_client, valuetype {
 project (EC_controller) : ciao_client, valuetype {
   exename = controller
   after += EC_stub
-  libs += EC_stub BasicSP_stub
-  libpaths += ..
+  libs += EC_stub BasicSP_stub TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
 
   IDL_Files {
   }
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/client.cpp b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/client.cpp
index 7de404f4beb..08e44208ae9 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/client.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/client.cpp
@@ -12,6 +12,7 @@
 //==============================================================
 
 #include "ECC.h"
+#include "ace/Streams.h"
 
 int
 main (int argc, char *argv[])
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/config b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/config
deleted file mode 100644
index 527aa2ba7ed..00000000000
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/config
+++ /dev/null
@@ -1 +0,0 @@
-EC_exec|createECHome_Impl|EC_svnt|createECHome_Servant
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/controller.cpp b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/controller.cpp
index 0d6a328b217..b07c7738792 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/controller.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/EC/controller.cpp
@@ -9,6 +9,7 @@
 
 #include "ECC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Streams.h"
 
 
 char *rategen_ior_ = 0;
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService.mpc b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService.mpc
index 238718f40f4..f2ea3775d0a 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP_EC2/RTEventService/RTEventService.mpc
@@ -5,8 +5,8 @@ project(RTEventService_stub): ciao_client {
   sharedname = RTEventService_stub
 
   idlflags += -Wb,stub_export_macro=RTEVENTSERVICE_STUB_Export -Wb,stub_export_include=RTEventService_stub_export.h -Wb,skel_export_macro=RTEVENTSERVICE_SVNT_Export -Wb,skel_export_include=RTEventService_svnt_export.h
-  libpaths += ..
-  libs += BasicSP_stub
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
+  libs += BasicSP_stub TAO_RTEvent
   dynamicflags   = RTEVENTSERVICE_STUB_BUILD_DLL
 
   IDL_Files {
@@ -21,8 +21,8 @@ project(RTEventService_stub): ciao_client {
 project(RTEventService_svnt) : ciao_servant {
   after += RTEventService_stub BasicSP_stub
   sharedname  = RTEventService_svnt
-  libs    += RTEventService_stub BasicSP_stub BasicSP_svnt
-  libpaths += ..
+  libs    += RTEventService_stub BasicSP_stub BasicSP_svnt TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags  +=  -Wb,export_macro=RTEVENTSERVICE_SVNT_Export -Wb,export_include=RTEventService_svnt_export.h
   dynamicflags = RTEVENTSERVICE_SVNT_BUILD_DLL
 
@@ -45,8 +45,8 @@ project(RTEventService_svnt) : ciao_servant {
 project(RTEventService_exec) : ciao_component {
   after += RTEventService_svnt
   sharedname = RTEventService_exec
-  libs      += RTEventService_stub RTEventService_svnt BasicSP_stub BasicSP_svnt
-  libpaths += ..
+  libs      += RTEventService_stub RTEventService_svnt BasicSP_stub BasicSP_svnt TAO_RTEvent
+  libpaths += ..,..\..\..\..\..\..\lib,..\..\..\..\..\tao\IFR_Client,..\..\..\..\..\tao\Valuetype,..\..\..\..\..\tao,..\..\..\..\..\..\ace,..\..\..\..\..\orbsvcs\orbsvcs,..\..\..\..\..\tao\PortableServer,..\..\..\..\..\tao\IORInterceptor,..\..\..\..\..\tao\ObjRefTemplate,..\..\..\..\..\..\ACEXML\parser\parser,..\..\..\..\..\..\ACEXML\common,..\..\..\..\..\tao\IORTable
   idlflags  +=  -Wb,export_macro=RTEVENTSERVICE_EXEC_Export -Wb,export_include=RTEventService_exec_export.h
   dynamicflags   = RTEVENTSERVICE_EXEC_BUILD_DLL