ChangeLogTag:Fri May 16 18:11:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

22 files changed, 567 insertions, 21 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index d0d99803af9..1f0aacc4ac7 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,29 @@
+Fri May 16 18:11:42 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* examples/handcrafted/BasicSP/BMDisplay/BMDisplay.idl (BasicSP): 
+	* examples/handcrafted/BasicSP/BasicSP.mpc:
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc:
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp:
+	* examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h:
+	* examples/handcrafted/BasicSP/EC/EC.idl:
+	* examples/handcrafted/BasicSP/EC/ECE.idl:
+	* examples/handcrafted/BasicSP/EC/EC_exec.cpp:
+	* examples/handcrafted/BasicSP/EC/EC_svnt.cpp:
+	* examples/handcrafted/BasicSP/EC/EC_svnt.h:
+	* examples/handcrafted/BasicSP/EC/client.cpp:
+	* examples/handcrafted/BasicSP/EC/controller.cpp:
+	* examples/handcrafted/BasicSP/descriptors/BMClosedED.csd:
+	* examples/handcrafted/BasicSP/descriptors/BMClosedED.ssd:
+	* examples/handcrafted/BasicSP/descriptors/BMDevice.csd:
+	* examples/handcrafted/BasicSP/descriptors/BMDevice.ssd:
+	* examples/handcrafted/BasicSP/descriptors/BMDisplay.csd:
+	* examples/handcrafted/BasicSP/descriptors/BMDisplay.ssd:
+	* examples/handcrafted/BasicSP/descriptors/BasicSP.cad:
+	* examples/handcrafted/BasicSP/descriptors/CIAO_Installation_Data.ini:
+	* examples/handcrafted/BasicSP/descriptors/EC.csd:
+	* examples/handcrafted/BasicSP/descriptors/EC.ssd: Some more files
+	  for the BasicSP example.
+
 Wed May 14 17:02:29 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
         * examples/handcrafted/BasicSP/EC/EC.idl:
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc
index fc59b4bec01..b4767b45514 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc
@@ -48,7 +48,9 @@ project(BMDevice_exec) : ciao_server {
   }
 
   Source_Files {
+    BMDeviceES.cpp
     BMDeviceEIC.cpp
+    BMDeviceEIS.cpp 
     BMDevice_exec.cpp
   }
 }
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp
index f92e205b170..a20b7a24d24 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.cpp
@@ -17,7 +17,6 @@ MyImpl::BMDevice_exec_i::~BMDevice_exec_i ()
 {
 }
 
-// Operations from HUDisplay::BMDevice
 BasicSP::CCM_ReadData_ptr
 MyImpl::BMDevice_exec_i::get_data_read (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h
index 55576bc3966..5f85d0ddff7 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h
@@ -112,7 +112,9 @@ namespace MyImpl
 
 // Executor DLL entry point.  CIAO's deployment and assembly framework
 // invokes this function on the resulting DLL to get the home executor.
-extern "C" BMDEVICE_EXEC_Export ::Components::HomeExecutorBase_ptr
-createBMDeviceHome_Impl (void);
+extern "C" BMDEVICE_EXEC_Export {
+  ::Components::HomeExecutorBase_ptr
+  createBMDeviceHome_Impl (void);
+}
 
 #endif /* CIAO_BMDEVICE_EXEC_H*/
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc
index 0b408bf5c6e..50f34474a1a 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc
@@ -31,6 +31,8 @@ project(BasicSP_svnt) : ciao_server {
   Source_Files {
     BasicSPC.cpp
     BasicSPS.cpp
+    BasicSPEC.cpp
+    BasicSPES.cpp
     BasicSP_svnt.cpp
   }
 }
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.idl b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.idl
index 053ac2d2085..50ad25afd7f 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.idl
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC.idl
@@ -16,13 +16,19 @@
 
 module BasicSP
 {
-  component EC
+  interface trigger
+    {
+      void start ();
+      void stop ();
+    };
+  component EC supports trigger
     {
       publishes TimeOut timeout;
 
       /// The attribute can be configured via the home or the
       /// component property file.
       attribute long hertz;
+
     };
 
   home ECHome manages EC
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/ECE.idl b/TAO/CIAO/examples/handcrafted/BasicSP/EC/ECE.idl
index bb30be71973..f6d517aa3ed 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/ECE.idl
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/ECE.idl
@@ -20,13 +20,13 @@
 module BasicSP
 {
   local interface CCM_EC_Executor
-    : Components::EnterpriseComponent
+    : Components::EnterpriseComponent, trigger
   {
     attribute long hertz;
   };
 
   local interface CCM_EC
-    : Components::EnterpriseComponent
+    : Components::EnterpriseComponent, trigger
   {
     attribute long hertz;
   };
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_exec.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_exec.cpp
index e8266f4d3f6..f7cad77e676 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_exec.cpp
@@ -152,6 +152,7 @@ void
 MyImpl::EC_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  cout << "Amba " << endl;
   if (this->hertz_ == 0 || this->pulser_.active())
     ACE_THROW (CORBA::BAD_INV_ORDER ());
 
@@ -256,7 +257,7 @@ MyImpl::ECHome_exec_i::~ECHome_exec_i ()
 
 ::Components::EnterpriseComponent_ptr
 MyImpl::ECHome_exec_i::new_EC (CORBA::Long hertz
-                                            ACE_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -268,6 +269,7 @@ MyImpl::ECHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
+  cout << "Got here" << endl;
   return new MyImpl::EC_exec_i ();
 }
 
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp
index dd1c22b7fa8..6e7508760f8 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp
@@ -636,7 +636,24 @@ CIAO_GLUE_BasicSP::EC_Servant::_ciao_passivate (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 
- CORBA::Long
+void
+CIAO_GLUE_BasicSP::EC_Servant::start (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  cout << "Amba Here ?? " << endl;
+  // Simply relay to executor.  May not need to return the result...
+  return this->executor_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+CIAO_GLUE_BasicSP::EC_Servant::stop (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Simply relay to executor.  May not need to return the result...
+  this->executor_->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+CORBA::Long
 CIAO_GLUE_BasicSP::EC_Servant::hertz (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -644,9 +661,9 @@ CIAO_GLUE_BasicSP::EC_Servant::hertz (ACE_ENV_SINGLE_ARG_DECL)
   return this->executor_->hertz (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
- void
+void
 CIAO_GLUE_BasicSP::EC_Servant::hertz (CORBA::Long hertz
-                                             ACE_ENV_SINGLE_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Simply relay to executor.  May not need to return the result...
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.h
index 17f9fd113f9..7f3ae042251 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.h
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.h
@@ -131,6 +131,11 @@ namespace CIAO_GLUE_BasicSP
     ~EC_Servant (void);
 
     // Operations from supported interfaces and inherited components
+    virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual CORBA::Long hertz (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
@@ -382,10 +387,5 @@ createECHome_Servant (::Components::HomeExecutorBase_ptr p,
                            CIAO::Session_Container *c
                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-#if defined (__ACE_INLINE__)
-# include "EC_svnt.inl"
-#endif /* __ACE_INLINE__ */
-
-
 #include "ace/post.h"
 #endif /* CIAO_GLUE_SESSION_EC_SVNT_H */
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/client.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/EC/client.cpp
index 366131f28d9..7de404f4beb 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/client.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/client.cpp
@@ -24,7 +24,7 @@ main (int argc, char *argv[])
       // Resolve HomeFinder interface
 
       CORBA::Object_var obj
-        = orb->string_to_object ("file://ECHome.ior" ACE_ENV_ARG_PARAMETER);
+        = orb->string_to_object ("file://ec.ior" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       BasicSP::ECHome_var home
@@ -36,11 +36,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire ECHome objref\n"), -1);
 
       BasicSP::EC_var pulser
-        = home->new_EC (8
-                        ACE_ENV_ARG_PARAMETER);
+        = home->create (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // Place to plug in the rate
+      pulser->hertz (5
+                     ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      pulser->start (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (45);
+
+      pulser->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
       home->remove_component (pulser.in ()
                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/EC/controller.cpp
index 3714b6ab7fd..8bc5076710b 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/controller.cpp
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/controller.cpp
@@ -90,9 +90,24 @@ main (int argc, char *argv[])
                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "Start up the Rate Generator\n"));
-
+      if (turn_on)
+        {
+          pulser->hertz (rate
+                         ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          ACE_DEBUG ((LM_DEBUG, "Start up the Event services\n"));
+
+          pulser->start (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      else
+        {
+          pulser->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          ACE_DEBUG ((LM_DEBUG, "Stop the ES\n"));
+        }
 
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.csd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.csd
new file mode 100644
index 00000000000..6dcb0f0c54a
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.csd
@@ -0,0 +1,44 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
+<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+
+<!-- GPS's Software Package Descriptor  -->
+<!-- This file describes various GPS executor -->
+<!-- implementations. -->
+
+
+<softpkg name="CIAO-BMClosedED" version="1.0">
+  <pkgtype>CORBA Component</pkgtype>
+  <title>BMClosedED</title>
+  <author>
+    <company>ISIS at Vanderbilt University</company>
+    <webpage href="http://www.cs.wustl.edu/~doc/"/>
+  </author>
+  <description>A BMClosedED executor implementation.</description>
+  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
+  <idl id="IDL:BasicSP/BMClosedED:1.0" homeid="IDL:BasicSP/BMClosedEDHome:1.0">
+  <fileinarchive name="BMClosedED.idl"/>
+  </idl>
+
+  <descriptor type="CORBA Component">
+    <fileinarchive name="BMClosedED.ccd"/>
+  </descriptor>
+
+  <implementation id="DCE:8E6C468D-A39F-46b4-962B-265F1AA8D538">
+
+  <dependency type="CIAODLL">
+    <softpkgref>
+      <fileinarchive name="BMClosedED.ssd"/>
+      <implref idref="DCE:CDC06FCA-50FC-43ca-8ECC-BEFBD33FEE78"/>
+    </softpkgref>
+  </dependency>
+
+  <code type="DLL">
+    <fileinarchive name="BMClosedED_exec"/>
+    <entrypoint>createBMClosedEDHome_Impl</entrypoint>
+  </code>
+
+  </implementation>
+
+</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.ssd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.ssd
new file mode 100644
index 00000000000..f455966e941
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.ssd
@@ -0,0 +1,42 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
+<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+
+<!-- RateGen's Servant Software Descriptor  -->
+<!-- This file describes various RateGen servant -->
+<!-- implementations. -->
+
+
+<softpkg name="CIAO-BMClosedED-Servant" version="1.0">
+  <pkgtype>CIAO Servant</pkgtype>
+  <title>BasicSP::BMDevice Servants</title>
+  <author>
+    <company>ISIS at Vanderbilt University</company>
+    <webpage href="http://www.dre.vanderbilt.edu/"/>
+  </author>
+  <description>A EC event generator implementation.</description>
+  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
+  <idl id="IDL:BasicSP/BMClosedED:1.0" homeid="IDL:BasicSP/BMClosedEDHome:1.0">
+    <fileinarchive name="BMClosedED.idl"/>
+  </idl>
+
+  <descriptor type="CORBA Component">
+    <fileinarchive name="BMClosedED.ccd"/>
+  </descriptor>
+
+  <implementation id="DCE:CDC06FCA-50FC-43ca-8ECC-BEFBD33FEE78">
+
+    <dependency type="ORB">
+      <name>TAO</name>
+    </dependency>
+
+    <code>
+      <!-- No need to specify extension below since ACE takes care of that, -->
+      <fileinarchive name="BMClosedED_svnt"/>
+      <entrypoint>createBMClosedEDHome_Servant</entrypoint>
+    </code>
+
+  </implementation>
+
+</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.csd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.csd
new file mode 100644
index 00000000000..91205bdeb82
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.csd
@@ -0,0 +1,45 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
+<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+
+<!-- GPS's Software Package Descriptor  -->
+<!-- This file describes various GPS executor -->
+<!-- implementations. -->
+
+
+<softpkg name="CIAO-BMDevice" version="1.0">
+  <pkgtype>CORBA Component</pkgtype>
+  <title>BMDevice</title>
+  <author>
+    <company>ISIS at Vanderbilt University</company>
+    <webpage href="http://www.cs.wustl.edu/~doc/"/>
+  </author>
+  <description>A BMDevice executor implementation.</description>
+  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
+  <idl id="IDL:BasicSP/BMDevice:1.0" homeid="IDL:BasicSP/BMDeviceHome:1.0">
+  <fileinarchive name="BMDevice.idl"/>
+  </idl>
+
+  <descriptor type="CORBA Component">
+    <fileinarchive name="BMDevice.ccd"/>
+  </descriptor>
+
+  <implementation id="DCE:82C2B032-37F0-4315-A59F-7020D3264E4D">
+
+    <!-- CIAO extension -->
+    <dependency type="CIAODLL">
+      <softpkgref>
+        <fileinarchive name="BMDevice.ssd"/>
+        <implref idref="DCE:93D254CF-9538-44e8-BB98-AABCD134ADD3"/>
+      </softpkgref>
+    </dependency>
+
+    <code type="DLL">
+      <fileinarchive name="BMDevice_exec"/>
+      <entrypoint>createBMDeviceHome_Impl</entrypoint>
+    </code>
+
+  </implementation>
+
+</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.ssd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.ssd
new file mode 100644
index 00000000000..5a63ed31c88
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.ssd
@@ -0,0 +1,42 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
+<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+
+<!-- RateGen's Servant Software Descriptor  -->
+<!-- This file describes various RateGen servant -->
+<!-- implementations. -->
+
+
+<softpkg name="CIAO-BMDevice-Servant" version="1.0">
+  <pkgtype>CIAO Servant</pkgtype>
+  <title>BasicSP::BMDevice Servants</title>
+  <author>
+    <company>ISIS at Vanderbilt University</company>
+    <webpage href="http://www.dre.vanderbilt.edu/"/>
+  </author>
+  <description>A EC event generator implementation.</description>
+  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
+  <idl id="IDL:BasicSP/BMDevice:1.0" homeid="IDL:BasicSP/BMDeviceHome:1.0">
+    <fileinarchive name="BMDevice.idl"/>
+  </idl>
+
+  <descriptor type="CORBA Component">
+    <fileinarchive name="BMDevice.ccd"/>
+  </descriptor>
+
+  <implementation id="DCE:93D254CF-9538-44e8-BB98-AABCD134ADD3">
+
+    <dependency type="ORB">
+      <name>TAO</name>
+    </dependency>
+
+    <code>
+      <!-- No need to specify extension below since ACE takes care of that, -->
+      <fileinarchive name="EC_svnt"/>
+      <entrypoint>createBMDeviceHome_Servant</entrypoint>
+    </code>
+
+  </implementation>
+
+</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.csd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.csd
new file mode 100644
index 00000000000..31c4367ddcd
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.csd
@@ -0,0 +1,45 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
+<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+
+<!-- GPS's Software Package Descriptor  -->
+<!-- This file describes various GPS executor -->
+<!-- implementations. -->
+
+
+<softpkg name="CIAO-BMDisplay" version="1.0">
+  <pkgtype>CORBA Component</pkgtype>
+  <title>BMDisplay</title>
+  <author>
+    <company>ISIS at Vanderbilt University</company>
+    <webpage href="http://www.cs.wustl.edu/~doc/"/>
+  </author>
+  <description>A BMDisplay executor implementation.</description>
+  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
+  <idl id="IDL:BasicSP/BMDisplay:1.0" homeid="IDL:BasicSP/BMDisplayHome:1.0">
+  <fileinarchive name="BMDisplay.idl"/>
+  </idl>
+
+  <descriptor type="CORBA Component">
+    <fileinarchive name="BMDisplay.ccd"/>
+  </descriptor>
+
+  <implementation id="DCE:8E92655E-CA07-46C8-B127-0F0872A8CC29">
+
+    <!-- CIAO extension -->
+    <dependency type="CIAODLL">
+      <softpkgref>
+        <fileinarchive name="BMDisplay.ssd"/>
+        <implref idref="DCE:D7984625-8561-431d-9927-4E498B317C02"/>
+      </softpkgref>
+    </dependency>
+
+    <code type="DLL">
+      <fileinarchive name="BMDisplay_exec"/>
+      <entrypoint>createBMDisplayHome_Impl</entrypoint>
+    </code>
+
+  </implementation>
+
+</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.ssd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.ssd
new file mode 100644
index 00000000000..773134dce15
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.ssd
@@ -0,0 +1,42 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
+<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+
+<!-- RateGen's Servant Software Descriptor  -->
+<!-- This file describes various RateGen servant -->
+<!-- implementations. -->
+
+
+<softpkg name="CIAO-BMDisplay-Servant" version="1.0">
+  <pkgtype>CIAO Servant</pkgtype>
+  <title>BasicSP::BMDisplay Servants</title>
+  <author>
+    <company>ISIS at Vanderbilt University</company>
+    <webpage href="http://www.dre.vanderbilt.edu/"/>
+  </author>
+  <description>A EC event generator implementation.</description>
+  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
+  <idl id="IDL:BasicSP/BMDisplay:1.0" homeid="IDL:BasicSP/BMDisplayHome:1.0">
+    <fileinarchive name="BMDisplay.idl"/>
+  </idl>
+
+  <descriptor type="CORBA Component">
+    <fileinarchive name="BMDisplay.ccd"/>
+  </descriptor>
+
+  <implementation id="DCE:D7984625-8561-431d-9927-4E498B317C02">
+
+    <dependency type="ORB">
+      <name>TAO</name>
+    </dependency>
+
+    <code>
+      <!-- No need to specify extension below since ACE takes care of that, -->
+      <fileinarchive name="BMDisplay_svnt"/>
+      <entrypoint>createBMDisplayHome_Servant</entrypoint>
+    </code>
+
+  </implementation>
+
+</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BasicSP.cad b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BasicSP.cad
new file mode 100644
index 00000000000..e23d2f1bed5
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BasicSP.cad
@@ -0,0 +1,108 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
+<!DOCTYPE componentassembly SYSTEM "$(CIAO_ROOT)/docs/XML/componentassembly.dtd">
+
+<componentassembly id="Single-process Basic assembly">
+  <componentfiles>
+    <componentfile id="com-EC">
+      <fileinarchive name="EC.csd"/>
+    </componentfile>
+    <componentfile id="com-BMDevice">
+      <fileinarchive name="BMDevice.csd"/>
+    </componentfile>
+        <componentfile id="com-BMClosedED">
+      <fileinarchive name="BMClosedED.csd"/>
+    </componentfile>
+    <componentfile id="com-BMDisplay">
+      <fileinarchive name="BMDisplay.csd"/>
+    </componentfile>
+  </componentfiles>
+
+  <partitioning>
+
+  <!-- A plain vanilla partition.  We don't even need the processcollocation tag here. -->
+      <homeplacement id="a_ECHome">
+        <componentfileref idref="com-EC"/>
+        <componentinstantiation id="a_EC">
+          <registercomponent>
+            <!-- writeiortofile is a non-standard CIAO extension.  -->
+            <writeiortofile name="ec.ior"/>
+          </registercomponent>
+        </componentinstantiation>
+      </homeplacement>
+      <homeplacement id="a_BMDeviceHome">
+        <componentfileref idref="com-BMDevice"/>
+        <componentinstantiation id="a_BMDevice"/>
+      </homeplacement>
+      <homeplacement id="a_BMClosedEDHome">
+        <componentfileref idref="com-BMClosedED"/>
+        <componentinstantiation id="a_BMClosedED"/>
+      </homeplacement>
+      <homeplacement id="a_BMDisplayHome">
+        <componentfileref idref="com-BMDisplay"/>
+        <componentinstantiation id="a_BMDisplay"/>
+      </homeplacement>
+
+  </partitioning>
+
+  <connections>
+
+    <connectevent>
+      <consumesport>
+        <consumesidentifier>timeout</consumesidentifier>
+        <componentinstantiationref idref="a_BMDevice"/>
+      </consumesport>
+      <publishesport>
+        <publishesidentifier>timeout</publishesidentifier>
+        <componentinstantiationref idref="a_EC"/>
+      </publishesport>
+    </connectevent>
+
+    <connectevent>
+      <consumesport>
+        <consumesidentifier>in_avail</consumesidentifier>
+        <componentinstantiationref idref="a_BMClosedED"/>
+      </consumesport>
+      <publishesport>
+        <publishesidentifier>data_available</publishesidentifier>
+        <componentinstantiationref idref="a_BMDevice"/>
+      </publishesport>
+    </connectevent>
+
+    <connectevent>
+      <consumesport>
+        <consumesidentifier>data_ready</consumesidentifier>
+        <componentinstantiationref idref="a_BMDisplay"/>
+      </consumesport>
+      <publishesport>
+        <publishesidentifier>in_avail</publishesidentifier>
+        <componentinstantiationref idref="a_BMClosedED"/>
+      </publishesport>
+    </connectevent>
+
+    <connectinterface>
+      <usesport>
+        <usesidentifier>datain</usesidentifier>
+        <componentinstantiationref idref="a_BMClosedED"/>
+      </usesport>
+      <providesport>
+        <providesidentifier>data_read</providesidentifier>
+        <componentinstantiationref idref="a_BMDevice"/>
+      </providesport>
+    </connectinterface>
+
+    <connectinterface>
+      <usesport>
+        <usesidentifier>comp_data</usesidentifier>
+        <componentinstantiationref idref="a_BMDisplay"/>
+      </usesport>
+      <providesport>
+        <providesidentifier>datain</providesidentifier>
+        <componentinstantiationref idref="a_BMClosedED"/>
+      </providesport>
+    </connectinterface>
+
+  </connections>
+
+</componentassembly>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/CIAO_Installation_Data.ini b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/CIAO_Installation_Data.ini
new file mode 100644
index 00000000000..ba2027881c1
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/CIAO_Installation_Data.ini
@@ -0,0 +1,9 @@
+[ComponentInstallation]
+DCE:75309233-0E0A-4cfb-B186-3E99F69B1D40=EC_svnt
+DCE:82C2B032-37F0-4315-A59F-7020D3264E4D=BMDevice_exec
+DCE:8E92655E-CA07-46C8-B127-0F0872A8CC29=BMDisplay_exec
+DCE:93D254CF-9538-44e8-BB98-AABCD134ADD3=BMDevice_svnt
+DCE:CDC06FCA-50FC-43ca-8ECC-BEFBD33FEE78=BMClosedED_svnt
+DCE:8E6C468D-A39F-46b4-962B-265F1AA8D538=BMClosedED_exec
+DCE:D7984625-8561-431d-9927-4E498B317C02=BMDisplay_svnt
+DCE:3148F760-F2ED-4204-A775-6B972C10E8CB=EC_exec
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.csd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.csd
new file mode 100644
index 00000000000..e75cf833694
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.csd
@@ -0,0 +1,45 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
+<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+
+<!-- RateGen's Software Package Descriptor  -->
+<!-- This file describes various RateGen executor -->
+<!-- implementations. -->
+
+
+<softpkg name="CIAO-EC" version="1.0">
+  <pkgtype>CORBA Component</pkgtype>
+  <title>Event Generator</title>
+  <author>
+    <company>ISIS at Vanderbilt University</company>
+    <webpage href="http://www.dre.vanderbilt.edu/"/>
+  </author>
+  <description>A Event executor implementation.</description>
+  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
+  <idl id="IDL:BasicSP/EC:1.0" homeid="IDL:BasicSP/ECHome:1.0">
+    <fileinarchive name="EC.idl"/>
+  </idl>
+  <descriptor type="CORBA Component">
+    <fileinarchive name="EC.ccd"/>
+  </descriptor>
+  <implementation id="DCE:3148F760-F2ED-4204-A775-6B972C10E8CB">
+
+    <!-- CIAO extension -->
+  <dependency type="CIAODLL">
+    <softpkgref>
+    <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
+    <fileinarchive name="EC.ssd"/>
+    <implref idref="DCE:75309233-0E0A-4cfb-B186-3E99F69B1D40"/>
+    </softpkgref>
+  </dependency>
+
+  <code type="DLL">
+  <!-- No need to specify extension below since ACE takes care of that, -->
+  <fileinarchive name="EC_exec"/>
+  <entrypoint>createECHome_Impl</entrypoint>
+  </code>
+
+  </implementation>
+
+</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.ssd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.ssd
new file mode 100644
index 00000000000..71aa7ac5d94
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.ssd
@@ -0,0 +1,42 @@
+<?xml version="1.0"?> <!-- -*- SGML -*-  -->
+
+<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
+<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+
+<!-- RateGen's Servant Software Descriptor  -->
+<!-- This file describes various RateGen servant -->
+<!-- implementations. -->
+
+
+<softpkg name="CIAO-EC-Servant" version="1.0">
+  <pkgtype>CIAO Servant</pkgtype>
+  <title>BasicSP::EC Servants</title>
+  <author>
+    <company>ISIS at Vanderbilt University</company>
+    <webpage href="http://www.dre.vanderbilt.edu/"/>
+  </author>
+  <description>A EC event generator implementation.</description>
+  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
+  <idl id="IDL:BasicSP/EC:1.0" homeid="IDL:BasicSP/ECHome:1.0">
+    <fileinarchive name="EC.idl"/>
+  </idl>
+
+  <descriptor type="CORBA Component">
+    <fileinarchive name="EC.ccd"/>
+  </descriptor>
+
+  <implementation id="DCE:75309233-0E0A-4cfb-B186-3E99F69B1D40">
+
+    <dependency type="ORB">
+      <name>TAO</name>
+    </dependency>
+
+    <code>
+      <!-- No need to specify extension below since ACE takes care of that, -->
+      <fileinarchive name="EC_svnt"/>
+      <entrypoint>createECHome_Servant</entrypoint>
+    </code>
+
+  </implementation>
+
+</softpkg>
\ No newline at end of file