*** empty log message ***

28 files changed, 404 insertions, 703 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index b01111198fc..6928893505f 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,62 @@
+Sun Apr 06 20:36:39 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* examples/handcrafted/Display/CIAO_Installation_Data.ini:
+	* examples/handcrafted/Display/HUDisplay.cad:
+	* examples/handcrafted/Display/GPS/GPS.csd:
+	* examples/handcrafted/Display/GPS/GPS.ssd:
+	* examples/handcrafted/Display/NavDisplay/NavDisplay.csd:
+	* examples/handcrafted/Display/NavDisplay/NavDisplay.ssd:
+	* examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.csd:
+	* examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.ssd:
+	* examples/handcrafted/Display/RateGen/RateGen.csd:
+	* examples/handcrafted/Display/RateGen/RateGen.ssd: Removed these
+	  files as they have already been moved to the
+	  examples/handcrafted/Display/descriptors/ subdirectory.
+
+	* examples/handcrafted/Display/NOTE: Updated obsolete notes.
+
+	  Thanks to Andrey Nechypurenko
+	  <Andrey.Nechypurenko@mchp.siemens.de> for the following
+	  changes.  He reported, motivated or sent patches for them.
+
+	* examples/handcrafted/Display/descriptors/NOTE.txt: Fixed several
+	  typos.
+
+	* examples/handcrafted/Display/descriptors/DuelDisplay.cad:
+	* examples/handcrafted/Display/descriptors/GPS_tracing.csd:
+	* examples/handcrafted/Display/descriptors/HUDisplayGUI.cad:
+	* examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad:
+	  Updated these assembly descriptors to use the new GPS component
+	  that emulate a trace (instead of the random coordinates).
+
+	* examples/handcrafted/Display/NavDisplay/client.cpp:
+	* examples/handcrafted/Display/NavDisplayGUI_exec/run_test.pl:
+	  Removed these testing artifacts because NavDisplay component
+	  requires other component to function properly.
+
+	* tools/XML_Helpers/Assembly_Spec.inl: Fixed VC7.1 compilation
+	  error.
+
+	* examples/handcrafted/Display/GPS/GPS.mpc:
+	* examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp:
+	* examples/handcrafted/Display/GPS/GPS_tracing_exec.h: Added a
+	  new implementation for the GPS component.  This implementation
+	  simulates coordinates of a trace instead of some random
+	  positions.
+
+	* examples/handcrafted/Display/NavDisplay/NavDisplay.mpc:
+	* examples/handcrafted/Display/NavDisplayGUI_exec/DetailView.cpp:
+	* examples/handcrafted/Display/NavDisplayGUI_exec/MapView.cpp:
+	* examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp:
+	* examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h:
+	  Please find in attachment slightly modified version of
+	  NavDisplayGUI. I have modified it slightly mainly in order to
+	  let the GUI component to find background and animation images
+	  either based on ACE_ROOT or using ../NavDisplayGUI_exec/.
+
+	* examples/handcrafted/Display/NavDisplayGUI_exec/README: Removed
+	  the mentioning of run_test.pl.  It's no longer valid.
+
 Sat Apr 05 20:08:27 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ciao/CCM_Deployment.idl:
diff --git a/TAO/CIAO/examples/handcrafted/Display/CIAO_Installation_Data.ini b/TAO/CIAO/examples/handcrafted/Display/CIAO_Installation_Data.ini
deleted file mode 100644
index cc1a16affd5..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/CIAO_Installation_Data.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[ComponentInstallation]
-DCE:75309233-0E0A-4cfb-B186-3E99F69B1D40=GPS_svnt
-DCE:82C2B032-37F0-4315-A59F-7020D3264E4D=RateGen_exec
-DCE:93D254CF-9538-44e8-BB98-AABCD134ADD3=RateGen_svnt
-DCE:8E6C468D-A39F-46b4-962B-265F1AA8D538=NavDisplay_exec
-DCE:CDC06FCA-50FC-43ca-8ECC-BEFBD33FEE78=NavDisplay_svnt
-DCE:3148F760-F2ED-4204-A775-6B972C10E8CB=GPS_exec
-DCE:D7984625-8561-431d-9927-4E498B317C02=NavDisplayGUI_exec
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
index 2826b869621..a27b224f96a 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.mpc
@@ -1,5 +1,6 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -c -i GPS"
+// This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -i GPS"
+// This file has been manually modified to add a second component implementation.
 
 project(GPS_stub): ciao_client {
   depends += HUDisplay_stub
@@ -54,17 +55,20 @@ project(GPS_exec) : ciao_server {
   }
 }
 
-
-
-project (GPS_client) : ciao_client {
-  exename = client
-  depends += GPS_stub
+project(GPS_tracing_exec) : ciao_server {
+  depends   += GPS_svnt
+  sharedname = GPS_tracing_exec
+  libs      += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt
+  libpaths += ..
+  idlflags  +=  -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h
+  dllflags   = GPS_EXEC_BUILD_DLL
 
   IDL_Files {
+    GPSEI.idl
   }
 
   Source_Files {
-    client.cpp
+    GPSEIC.cpp
+    GPS_tracing_exec.cpp
   }
 }
-
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.ssd b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.ssd
deleted file mode 100644
index b68e7c62648..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.ssd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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 Servant Software Descriptor  -->
-<!-- This file describes various GPS servant -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-GPS-Servant" version="1.0">
-  <pkgtype>CIAO Servant</pkgtype>
-  <title>HUDisplay::GPS Servants</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A GPS servant implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:HUDisplay/GPS:1.0" homeid="IDL:HUDisplay/GPSHome:1.0">
-    <fileinarchive name="GPS.idl"/>
-  </idl>
-
-  <!-- Duplicate information.  We should use the copy in GPS.csd -->
-  <!-- So, do we really need this one? -->
-  <descriptor type="CORBA Component">
-    <fileinarchive name="GPS.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="GPS_svnt"/>
-      <entrypoint>createGPSHome_Servant</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp
new file mode 100644
index 00000000000..488425bd9b4
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.cpp
@@ -0,0 +1,137 @@
+// $Id$
+
+#include "GPS_tracing_exec.h"
+
+#define DISPLACEMENT 256
+
+/// Default constructor.
+MyImpl::GPS_tracing_exec_impl::GPS_tracing_exec_impl () : dx_(1), dy_(1)
+{
+  ACE_OS::srand ((u_int) ACE_OS::time ());
+
+  this->positionx_ = 20;
+  this->positiony_ = 25;
+}
+
+/// Default destructor.
+MyImpl::GPS_tracing_exec_impl::~GPS_tracing_exec_impl ()
+{
+}
+
+// Operations from HUDisplay::GPS
+
+HUDisplay::CCM_position_ptr
+MyImpl::GPS_tracing_exec_impl::get_MyLocation (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return HUDisplay::CCM_position::_duplicate (this);
+}
+
+void
+MyImpl::GPS_tracing_exec_impl::push_Refresh (HUDisplay::tick_ptr ev
+                                             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Refresh position
+  if(this->positionx_ > 500) this->dx_ = -1;
+  if(this->positionx_ < 10) this->dx_ = 1;
+  if(this->positiony_ > 300) this->dy_ = -1;
+  if(this->positiony_ < 10) this->dy_ = 1;
+
+  this->positionx_ += this->dx_;
+  this->positiony_ += this->dy_;
+
+  // Nitify others
+  HUDisplay::tick_var event = new OBV_HUDisplay::tick;
+
+  this->context_->push_Ready (event
+                              ACE_ENV_ARG_PARAMETER);
+}
+
+// Operations from HUDisplay::position
+
+CORBA::Long
+MyImpl::GPS_tracing_exec_impl::posx (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->positionx_;
+}
+
+CORBA::Long
+MyImpl::GPS_tracing_exec_impl::posy (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->positiony_;
+}
+
+// Operations from Components::SessionComponent
+void
+MyImpl::GPS_tracing_exec_impl::set_session_context (Components::SessionContext_ptr ctx
+                                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CCMException))
+{
+  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_impl::set_session_context\n"));
+
+  this->context_ =
+    HUDisplay::CCM_GPS_Context::_narrow (ctx
+                                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  if (CORBA::is_nil (this->context_.in ()))
+    ACE_THROW (CORBA::INTERNAL ());
+  // Urm, we actually discard exceptions thown from this operation.
+}
+
+void
+MyImpl::GPS_tracing_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CCMException))
+{
+  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_impl::ccm_activate\n"));
+}
+
+void
+MyImpl::GPS_tracing_exec_impl::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CCMException))
+{
+  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_impl::ccm_passivate\n"));
+}
+
+void
+MyImpl::GPS_tracing_exec_impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CCMException))
+{
+  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_impl::ccm_remove\n"));
+}
+
+/// Default ctor.
+MyImpl::GPSHome_tracing_exec_impl::GPSHome_tracing_exec_impl ()
+{
+}
+
+/// Default dtor.
+MyImpl::GPSHome_tracing_exec_impl::~GPSHome_tracing_exec_impl ()
+{
+}
+
+// Explicit home operations.
+
+// Implicit home operations.
+
+::Components::EnterpriseComponent_ptr
+MyImpl::GPSHome_tracing_exec_impl::create (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Components::CreateFailure))
+{
+  return new MyImpl::GPS_tracing_exec_impl;
+}
+
+
+extern "C" GPS_EXEC_Export ::Components::HomeExecutorBase_ptr
+createGPSHome_Tracing_Impl (void)
+{
+  return new MyImpl::GPSHome_tracing_exec_impl;
+}
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.h b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.h
new file mode 100644
index 00000000000..9430576d820
--- /dev/null
+++ b/TAO/CIAO/examples/handcrafted/Display/GPS/GPS_tracing_exec.h
@@ -0,0 +1,120 @@
+// $Id$
+
+/**
+ * @file GPS_tracing_exec.h
+ *
+ * Header file for the actual GPS and GPSHome component
+ * implementations.
+ *
+ * @author Nanbor Wang <nanbor@cse.wustl.edu>
+ */
+
+#ifndef GPS_TRACING_EXEC_H
+#define GPS_TRACING_EXEC_H
+
+#include "GPSEIC.h"
+#include "tao/LocalObject.h"
+
+namespace MyImpl
+{
+  /**
+   * @class GPS_tracing_exec_impl
+   *
+   * RateGen executor implementation class.
+   */
+  class GPS_EXEC_Export GPS_tracing_exec_impl :
+    public virtual HUDisplay::GPS_Exec,
+    public virtual TAO_Local_RefCounted_Object
+  {
+  public:
+    /// Default constructor.
+    GPS_tracing_exec_impl ();
+
+    /// Default destructor.
+    ~GPS_tracing_exec_impl ();
+
+    // Operations from HUDisplay::GPS
+
+    virtual HUDisplay::CCM_position_ptr
+    get_MyLocation (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual void
+    push_Refresh (HUDisplay::tick_ptr ev
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    // Operations from HUDisplay::position
+
+    virtual CORBA::Long
+    posx (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual CORBA::Long
+    posy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    // Operations from Components::SessionComponent
+
+    virtual void
+    set_session_context (Components::SessionContext_ptr ctx
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
+
+    virtual void
+    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
+
+    virtual void
+    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
+
+    virtual void
+    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CCMException));
+  protected:
+    CORBA::Long positionx_;
+    CORBA::Long positiony_;
+    int dx_;
+    int dy_;
+
+    /// Copmponent specific context
+    HUDisplay::CCM_GPS_Context_var context_;
+  };
+
+  /**
+   * @class GPSHome_tracing_exec_impl
+   *
+   * GPS home executor implementation class.
+   */
+  class GPS_EXEC_Export GPSHome_exec_impl :
+    public virtual HUDisplay::CCM_GPSHome,
+    public virtual TAO_Local_RefCounted_Object
+  {
+  public:
+    /// Default ctor.
+    GPSHome_tracing_exec_impl ();
+
+    /// Default dtor.
+    ~GPSHome_tracing_exec_impl ();
+
+    // Explicit home operations.
+
+    // Implicit home operations.
+
+    virtual ::Components::EnterpriseComponent_ptr
+    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       Components::CreateFailure));
+  };
+
+}
+
+extern "C" GPS_EXEC_Export ::Components::HomeExecutorBase_ptr
+createGPSHome_Tracing_Impl (void);
+
+#endif /* GPS_TRACING_EXEC_H */
diff --git a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.cad b/TAO/CIAO/examples/handcrafted/Display/HUDisplay.cad
deleted file mode 100644
index 47609e5ac4e..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/HUDisplay.cad
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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 HUDisplay assembly">
-  <componentfiles>
-    <componentfile id="com-RateGen">
-      <fileinarchive name="RateGen/RateGen.csd"/>
-    </componentfile>
-    <componentfile id="com-GPS">
-      <fileinarchive name="GPS/GPS.csd"/>
-    </componentfile>
-    <componentfile id="com-NavDisplay">
-      <fileinarchive name="NavDisplay/NavDisplay.csd"/>
-    </componentfile>
-  </componentfiles>
-
-  <partitioning>
-
-  <!-- A plain vanilla partition.  We don't even need the processcollocation tag here. -->
-      <homeplacement id="a_RateGenHome">
-        <componentfileref idref="com-RateGen"/>
-        <componentinstantiation id="a_RateGen"/>
-      </homeplacement>
-
-      <homeplacement id="a_GPSHome">
-        <componentfileref idref="com-GPS"/>
-        <componentinstantiation id="a_GPS"/>
-      </homeplacement>
-
-      <homeplacement id="a_NavDisplayHome">
-        <componentfileref idref="com-NavDisplay"/>
-        <componentinstantiation id="a_NavDisplay"/>
-      </homeplacement>
-
-  </partitioning>
-
-  <connections>
-
-    <connectevent>
-      <consumesport>
-        <consumesidentifier>Refresh</consumesidentifier>
-        <componentinstantiationref idref="a_GPS"/>
-      </consumesport>
-      <publishesport>
-        <publishesidentifier>Pulse</publishesidentifier>
-        <componentinstantiationref idref="a_RateGen"/>
-      </publishesport>
-    </connectevent>
-
-    <connectevent>
-      <consumesport>
-        <consumesidentifier>Refresh</consumesidentifier>
-        <componentinstantiationref idref="a_NavDisplay"/>
-      </consumesport>
-      <publishesport>
-        <publishesidentifier>Ready</publishesidentifier>
-        <componentinstantiationref idref="a_GPS"/>
-      </publishesport>
-    </connectevent>
-
-    <connectinterface>
-      <usesport>
-        <usesidentifier>GPSLocation</usesidentifier>
-        <componentinstantiationref idref="a_NavDisplay"/>
-      </usesport>
-      <providesport>
-        <providesidentifier>MyLocation</providesidentifier>
-        <componentinstantiationref idref="a_GPS"/>
-      </providesport>
-    </connectinterface>
-
-  </connections>
-
-</componentassembly>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/Display/NOTE b/TAO/CIAO/examples/handcrafted/Display/NOTE
index cdd8c162b22..dae5515157f 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NOTE
+++ b/TAO/CIAO/examples/handcrafted/Display/NOTE
@@ -13,19 +13,42 @@ situation with CIDL compiler.  It looks like we should be able to pass
 a bunch of IDL definitions thru CIDL compiler and get the equivalent
 executor interfaces automatically.  But we'll have to see.
 
+To try out this example, read the following document taken from a
+short note I wrote for a snapshot release:
 
-To generate mpc files:
+     This is a multiple-component example.  RateGen component
+     subdirectory contains a run_test.pl that you can use to
+     instantiate a component instance, like you would do with the
+     Hello example.  The other components require collaboration with
+     other components and I don't have client programs to test them
+     out individually.
 
-  HUDisplay:
+     This example also lets you compose all the components into a
+     distributed application using the Assembly_Deployer.  Change
+     directory to
 
-   generate_component_mpc.pl -n HUDisplay
+        $CIAO_ROOT/examples/handcrafted/Display/descriptors
 
+     and take a look at the file: NOTE.txt.  This file describes the
+     steps to compose the application using various different
+     configurations and composition specs.
 
-  All others
+* There are MSVC 6 workspaces and projects available in the workspace.
+  Some of them also contain UNIX makefiles.  If you can not find the
+  Makefiles for unix platform you are using, you can use mwc to create
+  them.  For examples, to compile the multi-component example, use the
+  following:
 
-   generate_component_mpc.pl -l .. -p HUDisplay {RateGen|GPS|NavDisplay}
+        $ cd $CIAO_ROOT/examples/handcrafted/Display
+        $ $(ACE_ROOT)/bin/mwc.pl
+        $ make
 
-To generate Makefiles/Projects of your choice, try the following under
-the current directory $(CIAO_ROOT)/examples/handcrafted/Display/:
+  To regenerate VC6 dsp files, do:
 
-  mwc -type <makefile type> -dynamic_only
+        > cd $CIAO_ROOT/examples/handcrafted/Display
+        > $(ACE_ROOT)/bin/mwc.pl -type vc6
+
+  Likewise, to regenerate VC7.NET project files, do:
+
+        > cd $CIAO_ROOT/examples/handcrafted/Display
+        > $(ACE_ROOT)/bin/mwc.pl -type vc7
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.csd b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.csd
deleted file mode 100644
index 4d32cf58851..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.csd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
-
-<!-- NavDisplay's Software Package Descriptor  -->
-<!-- This file describes various NavDisplay executor -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-NavDisplay" version="1.0">
-  <pkgtype>CORBA Component</pkgtype>
-  <title>Rate Generator</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A NavDisplay executor implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:HUDisplay/NavDisplay:1.0" homeid="IDL:HUDisplay/NavDisplayHome:1.0">
-    <fileinarchive name="NavDisplay.idl"/>
-  </idl>
-
-  <!-- We don't need a property file for this example.  However,         -->
-  <!-- what to do with this element?  Cache it in ComponentInstallation? -->
-  <!-- A better question maybe, when do we actually read the file and    -->
-  <!-- build the attributes defined in the file?  By Assembly perhaps?   -->
-  <!-- Notice that this property file applies to the implementation itself. -->
-  <!-- Whatever that means. -->
-<!--   <propertyfile> -->
-<!--     <fileinarchive name="empty.cpf"/> -->
-<!--   </propertyfile> -->
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="NavDisplay.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:8E6C468D-A39F-46b4-962B-265F1AA8D538">
-
-    <!-- CIAO extension -->
-    <dependency type="CIAODLL">
-      <softpkgref>
-        <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
-        <fileinarchive name="NavDisplay.ssd"/>
-        <implref idref="DCE:CDC06FCA-50FC-43ca-8ECC-BEFBD33FEE78"/>
-      </softpkgref>
-    </dependency>
-
-    <!-- What happens when one define descriptors for both softpkg and -->
-    <!-- implementations? -->
-
-    <code type="DLL">
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="NavDisplay_exec"/>
-      <entrypoint>createNavDisplayHome_Impl</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
index 58d7a396071..8be86996a1f 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.mpc
@@ -1,5 +1,5 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -c -i NavDisplay"
+// This file is generated with "generate_component_mpc.pl -l .. -p HUDisplay -i NavDisplay"
 
 project(NavDisplay_stub): ciao_client {
   depends += HUDisplay_stub
@@ -56,15 +56,3 @@ project(NavDisplay_exec) : ciao_server {
 
 
 
-project (NavDisplay_client) : ciao_client {
-  exename = client
-  depends += NavDisplay_stub HUDisplay_stub
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    client.cpp
-  }
-}
-
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.ssd b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.ssd
deleted file mode 100644
index f1e16629f90..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/NavDisplay.ssd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
-
-<!-- NavDisplay's Servant Software Descriptor  -->
-<!-- This file describes various NavDisplay servant -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-NavDisplay-Servant" version="1.0">
-  <pkgtype>CIAO Servant</pkgtype>
-  <title>HUDisplay::NavDisplay Servants</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A NavDisplay servant implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:HUDisplay/NavDisplay:1.0" homeid="IDL:HUDisplay/NavDisplayHome:1.0">
-    <fileinarchive name="NavDisplay.idl"/>
-  </idl>
-
-  <!-- Duplicate information.  We should use the copy in NavDisplay.csd -->
-  <!-- So, do we really need this one? -->
-  <descriptor type="CORBA Component">
-    <fileinarchive name="NavDisplay.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="NavDisplay_svnt"/>
-      <entrypoint>createNavDisplayHome_Servant</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/client.cpp b/TAO/CIAO/examples/handcrafted/Display/NavDisplay/client.cpp
deleted file mode 100644
index 6ccd27f4454..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplay/client.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-
-#include "NavDisplayC.h"
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv ACE_ENV_ARG_PARAMETER);
-
-      // Resolve HomeFinder interface
-
-      CORBA::Object_var obj
-        = orb->string_to_object ("file://NavDisplayHome.ior" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      HUDisplay::NavDisplayHome_var home
-        = HUDisplay::NavDisplayHome::_narrow (obj
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (home.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire NavDisplayHome objref\n"), -1);
-
-      HUDisplay::NavDisplay_var navdisplay
-        = home->create(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      HUDisplay::tickConsumer_var consumer_refresh =
-        navdisplay->get_consumer_Refresh(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      HUDisplay::tick_var ev = new OBV_HUDisplay::tick ();
-
-      ACE_Time_Value sleep_time (0, 20000); // 20 milliseconds
-
-      for(unsigned i = 0; i < 1000; i++)
-      {
-        consumer_refresh->push_tick(ev.in()
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        ACE_OS::sleep(sleep_time);
-      }
-
-      ACE_OS::sleep (5);
-
-      home->remove_component (navdisplay.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Who is the culprit \n");
-      cerr << "Uncaught CORBA exception" << endl;
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/DetailView.cpp b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/DetailView.cpp
index 5f1464022b1..8a5c61d3c2f 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/DetailView.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/DetailView.cpp
@@ -53,7 +53,18 @@ DetailView::DetailView(QWidget *parent, const char *name)
   grid->addWidget(z_edit, 3, 7);
 
   // Create a label containing a QMovie
-  movie = QMovie("trolltech.gif");
+  QString path_to_movie;
+  char *ace_root = getenv("ACE_ROOT");
+  if(ace_root)
+  {
+    path_to_movie += ace_root;
+    path_to_movie += "/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/trolltech.gif";
+  }
+  else
+  {
+    path_to_movie = "../NavDisplayGUI_exec/trolltech.gif";
+  }
+  movie = QMovie(path_to_movie);
   movielabel = new QLabel(this, "label1" );
   movie.connectStatus(this, SLOT(movieStatus(int)));
   movie.connectUpdate(this, SLOT(movieUpdate(const QRect&)));
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/MapView.cpp b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/MapView.cpp
index 498ed51f4cd..19f444e281e 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/MapView.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/MapView.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "MapView.h"
-
+#include <stdlib.h>
 
 MapView::MapView(
 	QCanvas& c,
@@ -9,13 +9,20 @@ MapView::MapView(
 	const char* name,
   WFlags f)
   :
-  bg_pixmap_("worldmap1.gif"),
-  //bg_pixmap_("ukraine-map.gif"),
   QCanvasView(&c, parent, name, f)
 {
-  bg_pixmap_.load("worldmap1.gif");
-  //bg_pixmap_.load("ukraine-map.gif");
-
+  QString path_to_movie;
+  char *ace_root = getenv("ACE_ROOT");
+  if(ace_root)
+  {
+    path_to_movie += ace_root;
+    path_to_movie += "/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/worldmap1.gif";
+  }
+  else
+  {
+    path_to_movie = "../NavDisplayGUI_exec/worldmap1.gif";
+  }
+  bg_pixmap_.load(path_to_movie);
   viewport()->setBackgroundMode(NoBackground);
   enableClipper(TRUE);
   if(!bg_pixmap_.isNull())
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.csd b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.csd
deleted file mode 100644
index 1c8b3e9cfe4..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.csd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
-
-<!-- NavDisplay's Software Package Descriptor  -->
-<!-- This file describes various NavDisplay executor -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-NavDisplay" version="1.0">
-  <pkgtype>CORBA Component</pkgtype>
-  <title>Rate Generator</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A NavDisplay executor implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:HUDisplay/NavDisplay:1.0" homeid="IDL:HUDisplay/NavDisplayHome:1.0">
-    <fileinarchive name="NavDisplay.idl"/>
-  </idl>
-
-  <!-- We don't need a property file for this example.  However,         -->
-  <!-- what to do with this element?  Cache it in ComponentInstallation? -->
-  <!-- A better question maybe, when do we actually read the file and    -->
-  <!-- build the attributes defined in the file?  By Assembly perhaps?   -->
-  <!-- Notice that this property file applies to the implementation itself. -->
-  <!-- Whatever that means. -->
-<!--   <propertyfile> -->
-<!--     <fileinarchive name="empty.cpf"/> -->
-<!--   </propertyfile> -->
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="NavDisplayGUI.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:D7984625-8561-431d-9927-4E498B317C02">
-
-    <!-- CIAO extension -->
-    <dependency type="CIAODLL">
-      <softpkgref>
-        <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
-        <fileinarchive name="NavDisplayGUI.ssd"/>
-        <implref idref="DCE:CDC06FCA-50FC-43ca-8ECC-BEFBD33FEE78"/>
-      </softpkgref>
-    </dependency>
-
-    <!-- What happens when one define descriptors for both softpkg and -->
-    <!-- implementations? -->
-
-    <code type="DLL">
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="NavDisplayGUI_exec"/>
-      <entrypoint>createNavDisplayHome_Impl</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.ssd b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.ssd
deleted file mode 100644
index dac071cb28f..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI.ssd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?> <!-- -*- SGML -*-  -->
-
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
-
-<!-- NavDisplay's Servant Software Descriptor  -->
-<!-- This file describes various NavDisplay servant -->
-<!-- implementations. -->
-
-
-<softpkg name="CIAO-NavDisplay-Servant" version="1.0">
-  <pkgtype>CIAO Servant</pkgtype>
-  <title>HUDisplay::NavDisplay Servants</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A NavDisplay servant implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:HUDisplay/NavDisplay:1.0" homeid="IDL:HUDisplay/NavDisplayHome:1.0">
-    <fileinarchive name="NavDisplay.idl"/>
-  </idl>
-
-  <!-- Duplicate information.  We should use the copy in NavDisplay.csd -->
-  <!-- So, do we really need this one? -->
-  <descriptor type="CORBA Component">
-    <fileinarchive name="NavDisplayGUI.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="NavDisplay_svnt"/>
-      <entrypoint>createNavDisplayHome_Servant</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
index b3577be5810..cb654aeef5f 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
@@ -17,7 +17,7 @@ static char *argv[] =
 
 /// Default constructor.
 MyImpl::NavDisplayGUI_exec_impl::NavDisplayGUI_exec_impl ()
-: unit_(1, "Model T3+"), loc_(50, 20, 0), dx_(1), dy_(2)
+: unit_(1, "Model T3+"), loc_(50, 20, 0)
 {
   ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::NavDisplayGUI_exec_impl ()\n"));
 }
@@ -53,11 +53,6 @@ MyImpl::NavDisplayGUI_exec_impl::push_Refresh (HUDisplay::tick_ptr ev
   loc_.x_ = lx % 500;
   loc_.y_ = ly % 300;
 
-//   if(loc_.x_ > 500) dx_ = -1;
-//   if(loc_.x_ < 10) dx_ = 1;
-//   if(loc_.y_ > 300) dy_ = -1;
-//   if(loc_.y_ < 10) dy_ = 1;
-
   this->unit_.setLocation(loc_);
 
   mutex_.release();
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
index 535be6b5727..deeb1157b09 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
@@ -73,7 +73,6 @@ namespace MyImpl
     Worker *worker_;
     NavUnit unit_;
     UnitLocation loc_;
-    int dx_, dy_;
     ACE_Thread_Mutex mutex_;
   };
 
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/README b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/README
index ab73f830a59..cb10cbe5cd2 100644
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/README
+++ b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/README
@@ -5,12 +5,3 @@ i.e. ACE_HAS_QT since this example does not relyes on Qt Reactor and
 communicates with GUI part using QApplication::postMessage() and
 simple Command Pattern based framework.  But be sure that QTDIR
 environment variable is pointed to your Qt instalation directory.
-
-This example uses the test client application from ../NavDisplay
-directory.  You can use run_test.pl located in this directory (not in
-../NavDisplay) to run the example.
-
-The expected behaviour - you should be able to see the moving red dot
-over the map and changing values of x and y coordinates in
-corresponding edit boxes. After several seconds the red dot stops and
-then after five seconds the application will be automatically closed.
diff --git a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/run_test.pl b/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/run_test.pl
deleted file mode 100644
index a90be35e0bd..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/NavDisplayGUI_exec/run_test.pl
+++ /dev/null
@@ -1,108 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../../../bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-$daemon_ior = PerlACE::LocalFile ("daemon.ior");
-$svr_ior = PerlACE::LocalFile ("server.ior");
-$home_ior = PerlACE::LocalFile ("NavDisplayHome.ior");
-
-unlink $daemon_ior;
-unlink $svr_ior;
-unlink $home_ior;
-
-# CIAO Daemon command line arguments
-$daemon_args = "-o $daemon_ior -i ../CIAO_Installation_Data.ini -n ../../../../tools/ComponentServer/ComponentServer";
-
-# CIAO Daemon Controller location:
-$controller = "../../../../tools/Daemon/DaemonController";
-
-# Daemon controller common command line arguments
-$common_args = "-ORBInitRef CIAODaemon=file://$daemon_ior";
-
-# Daemon controller start_home command
-$start_args = "start_home -s NavDisplayGUI.csd -m $home_ior -c $svr_ior";
-
-# Daemon controller end_home command
-$end_args = "end_home -c file://$svr_ior";
-
-# Daemon controller shutdown command
-$shutdown_args = "shutdown";
-
-# Client program command line arguments
-$cl_args = "";
-
-# Naming_Service process definition
-$DS = new PerlACE::Process ("../../../../tools/Daemon/CIAO_Daemon",
-                            "$daemon_args");
-
-# Client process definition
-$CL = new PerlACE::Process ("../NavDisplay/client",
-                            "$cl_args");
-
-## Starting up the CIAO daemon
-$DS->Spawn ();
-if (PerlACE::waitforfile_timed ($daemon_ior, 15) == -1) {
-    print STDERR "ERROR: Could not find daemon ior file <$daemon_ior>\n";
-    $DS->Kill ();
-    exit 1;
-}
-
-## Starting up a ComponentServer running the RateGen home.
-$DC = new PerlACE::Process ("$controller",
-                            "$common_args $start_args");
-
-$DC->SpawnWaitKill (60);
-if (PerlACE::waitforfile_timed ($home_ior, 15) == -1) {
-    print STDERR "ERROR: Could not find home ior file <$home_ior>\n";
-    $DS->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-## Terminating the ComponentServer running the RateGen home.
-$DC = new PerlACE::Process ("$controller",
-                            "$common_args $end_args");
-
-$ctrl = $DC->SpawnWaitKill (60);
-if ($ctrl != 0) {
-    print STDERR "ERROR: Fail to end component server\n";
-    $DS->Kill ();
-    exit 1;
-}
-
-## Terminating the ComponentServer running the RateGen home.
-$DC = new PerlACE::Process ("$controller",
-                            "$common_args $shutdown_args");
-
-$ctrl = $DC->SpawnWaitKill (60);
-if ($ctrl != 0) {
-    print STDERR "ERROR: Fail to shutdown CIAODaemon\n";
-    $DS->Kill ();
-    exit 1;
-}
-
-$ctrl = $DS->WaitKill (60);
-if ($ctrl != 0) {
-    print STDERR "ERROR: CIAODaemon didn't shutdown gracefully $ctrl\n";
-    $DS->Kill ();
-    exit 1;
-}
-
-unlink $daemon_ior;
-unlink $svr_ior;
-unlink $home_ior;
-
-exit $status;
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.csd b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.csd
deleted file mode 100644
index 37d60c4ed1a..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.csd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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-RateGen" version="1.0">
-  <pkgtype>CORBA Component</pkgtype>
-  <title>Rate Generator</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A RateGen executor implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:HUDisplay/RateGen:1.0" homeid="IDL:HUDisplay/RateGenHome:1.0">
-    <fileinarchive name="RateGen.idl"/>
-  </idl>
-
-  <!-- We don't need a property file for this example.  However,         -->
-  <!-- what to do with this element?  Cache it in ComponentInstallation? -->
-  <!-- A better question maybe, when do we actually read the file and    -->
-  <!-- build the attributes defined in the file?  By Assembly perhaps?   -->
-  <!-- Notice that this property file applies to the implementation itself. -->
-  <!-- Whatever that means. -->
-<!--   <propertyfile> -->
-<!--     <fileinarchive name="empty.cpf"/> -->
-<!--   </propertyfile> -->
-
-  <descriptor type="CORBA Component">
-    <fileinarchive name="RateGen.ccd"/>
-  </descriptor>
-
-  <implementation id="DCE:82C2B032-37F0-4315-A59F-7020D3264E4D">
-
-    <!-- CIAO extension -->
-    <dependency type="CIAODLL">
-      <softpkgref>
-        <!-- .ssd stands for Servant Software Descriptors which is a CIAO extension -->
-        <fileinarchive name="RateGen.ssd"/>
-        <implref idref="DCE:93D254CF-9538-44e8-BB98-AABCD134ADD3"/>
-      </softpkgref>
-    </dependency>
-
-    <!-- What happens when one define descriptors for both softpkg and -->
-    <!-- implementations? -->
-
-    <code type="DLL">
-      <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="RateGen_exec"/>
-      <entrypoint>createRateGenHome_Impl</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.ssd b/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.ssd
deleted file mode 100644
index 670969c7ff2..00000000000
--- a/TAO/CIAO/examples/handcrafted/Display/RateGen/RateGen.ssd
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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-RateGen-Servant" version="1.0">
-  <pkgtype>CIAO Servant</pkgtype>
-  <title>HUDisplay::RateGen Servants</title>
-  <author>
-    <company>Washington University in St. Louis</company>
-    <webpage href="http://www.cs.wustl.edu/~doc/"/>
-  </author>
-  <description>A RateGen servant implementation.</description>
-  <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
-  <idl id="IDL:HUDisplay/RateGen:1.0" homeid="IDL:HUDisplay/RateGenHome:1.0">
-    <fileinarchive name="RateGen.idl"/>
-  </idl>
-
-  <!-- Duplicate information.  We should use the copy in RateGen.csd -->
-  <!-- So, do we really need this one? -->
-  <descriptor type="CORBA Component">
-    <fileinarchive name="RateGen.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="RateGen_svnt"/>
-      <entrypoint>createRateGenHome_Servant</entrypoint>
-    </code>
-
-  </implementation>
-
-  <!-- Let's add more implementation description later when we try to -->
-  <!-- compile this stuff on, say, Solaris and Linux.                 -->
-
-</softpkg>
\ No newline at end of file
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/DuelDisplay.cad b/TAO/CIAO/examples/handcrafted/Display/descriptors/DuelDisplay.cad
index 69e2903b6ce..a5bfb59ca80 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/DuelDisplay.cad
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/DuelDisplay.cad
@@ -9,7 +9,7 @@
       <fileinarchive name="RateGen.csd"/>
     </componentfile>
     <componentfile id="com-GPS">
-      <fileinarchive name="GPS.csd"/>
+      <fileinarchive name="GPS_tracing.csd"/>
     </componentfile>
     <componentfile id="com-NavDisplay">
       <fileinarchive name="NavDisplay.csd"/>
diff --git a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.csd b/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS_tracing.csd
index a6e17406f41..894ccca55a7 100644
--- a/TAO/CIAO/examples/handcrafted/Display/GPS/GPS.csd
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS_tracing.csd
@@ -10,12 +10,12 @@
 
 <softpkg name="CIAO-GPS" version="1.0">
   <pkgtype>CORBA Component</pkgtype>
-  <title>Rate Generator</title>
+  <title>GPS tracing emulater</title>
   <author>
     <company>Washington University in St. Louis</company>
     <webpage href="http://www.cs.wustl.edu/~doc/"/>
   </author>
-  <description>A GPS executor implementation.</description>
+  <description>A GPS executor implementation that emulate a trace.</description>
   <license href="http://www.cs.wustl.edu/~schmidt/ACE-copying.html"/>
   <idl id="IDL:HUDisplay/GPS:1.0" homeid="IDL:HUDisplay/GPSHome:1.0">
     <fileinarchive name="GPS.idl"/>
@@ -35,7 +35,7 @@
     <fileinarchive name="GPS.ccd"/>
   </descriptor>
 
-  <implementation id="DCE:3148F760-F2ED-4204-A775-6B972C10E8CB">
+  <implementation id="DCE:8E92655E-CA07-46C8-B127-0F0872A8CC29">
 
     <!-- CIAO extension -->
     <dependency type="CIAODLL">
@@ -51,8 +51,8 @@
 
     <code type="DLL">
       <!-- No need to specify extension below since ACE takes care of that, -->
-      <fileinarchive name="GPS_exec"/>
-      <entrypoint>createGPSHome_Impl</entrypoint>
+      <fileinarchive name="GPS_tracing_exec"/>
+      <entrypoint>createGPSHome_Tracing_Impl</entrypoint>
     </code>
 
   </implementation>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplayGUI.cad b/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplayGUI.cad
index a2957ee6fa9..d4252fe4cb8 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplayGUI.cad
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplayGUI.cad
@@ -9,7 +9,7 @@
       <fileinarchive name="RateGen.csd"/>
     </componentfile>
     <componentfile id="com-GPS">
-      <fileinarchive name="GPS.csd"/>
+      <fileinarchive name="GPS_tracing.csd"/>
     </componentfile>
     <componentfile id="com-NavDisplay">
       <fileinarchive name="NavDisplayGUI.csd"/>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/NOTE.txt b/TAO/CIAO/examples/handcrafted/Display/descriptors/NOTE.txt
index 35c307a917a..da8cb73d512 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/NOTE.txt
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/NOTE.txt
@@ -41,14 +41,17 @@ test.dat:
                  from the default daemon shell.
 
   HUDisplayGUI.cad: Same as HUDisplay.cad, but instead of a text-based
-                    NavDisplay component, this descriptor instantiate
-                    a GUI NavDisplay window.
+                    NavDisplay component and a GPS component that
+                    generates random coordinations, this descriptor
+                    instantiate a GUI NavDisplay window and a GPS
+                    component that emulate a trace.
 
   RemoteDisplay.cad: This descriptor causes the NavDisplay component
                      to be instantiated in the "Remote" daemon.
 
   RemoteDisplayGUI.cad: Similar to RemoteDisplay.cad but uses a
-                        GUI-based NavDisplay component.
+                        GUI-based NavDisplay and the tracing GPS
+                        components.
 
   DuelDisplay.cad: A combination of HUDisplay.cad and
                    RemoteDisplayGUI.cad.  This example uses 4
@@ -59,7 +62,7 @@ Unfortunately, there's no run_test.pl for starting and running these
 example configurations/assemblies as these daemons/managers programs
 are still under development.  You will need several shell windows for
 them.  All the following step should be run from this subdirectory
-($CIAO_ROOT/examples/handcrafted/Displaydescriptors/).  Here are the
+($CIAO_ROOT/examples/handcrafted/Display/descriptors/).  Here are the
 steps to demonstrate the examples:
 
 Step 1:
@@ -83,7 +86,7 @@ Step 2:
   does the assembly work.  This should also be started in a separate
   shell window.
 
-    $(CIAO_ROOT/CIAO/tools/Assembly_Deployer/Assembly_Manager -o ior -c test.dat
+    $(CIAO_ROOT)/tools/Assembly_Deployer/Assembly_Manager -o ior -c test.dat
 
 Step 3:
 =======
@@ -112,7 +115,7 @@ Step 4:
 
   Once the controller is running, check out the Daemon window (for
   text-based NavDisplay component) or the GUI window for the output.
-  Once you are happy with it, press <entry> in this shell window to
+  Once you are happy with it, press <enter> in this shell window to
   terminate the controller program and you will stop the RateGen
   component from sending out more event.
 
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad b/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad
index aa0dd580038..414b1cef160 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad
@@ -9,7 +9,7 @@
       <fileinarchive name="RateGen.csd"/>
     </componentfile>
     <componentfile id="com-GPS">
-      <fileinarchive name="GPS.csd"/>
+      <fileinarchive name="GPS_tracing.csd"/>
     </componentfile>
     <componentfile id="com-NavDisplay">
       <fileinarchive name="NavDisplayGUI.csd"/>
diff --git a/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.inl b/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.inl
index fcebcc9914e..10af016a739 100644
--- a/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.inl
+++ b/TAO/CIAO/tools/XML_Helpers/Assembly_Spec.inl
@@ -47,7 +47,7 @@ CIAO::Assembly_Placement::Container::destination (const char *des)
 ACE_INLINE const char *
 CIAO::Assembly_Placement::Container::destination (void) const
 {
-  if (this->destination_.length == 0)
+  if (this->destination_.length () == 0)
     return 0;
   return this->destination_.c_str ();
 }