ChangeLogTag: Thu May 29 22:25:09 2003 Krishnakumar B <kitty@spam.invalid.domain>

27 files changed, 152 insertions, 87 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 2e716a633d0..1e3b5fb877d 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,44 @@
+Thu May 29 22:25:09 2003  Krishnakumar B  <kitty@spam.invalid.domain>
+
+        * docs/XML/componentassembly.dtd:
+
+          Fixed an error in the DTD.
+
+        * 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/EC.csd:
+        * examples/handcrafted/BasicSP/descriptors/EC.ssd:
+        * examples/handcrafted/Display/descriptors/DuelDisplay.cad:
+        * examples/handcrafted/Display/descriptors/GPS.csd:
+        * examples/handcrafted/Display/descriptors/GPS.ssd:
+        * examples/handcrafted/Display/descriptors/GPS_tracing.csd:
+        * examples/handcrafted/Display/descriptors/HUDisplay.cad:
+        * examples/handcrafted/Display/descriptors/HUDisplayGUI.cad:
+        * examples/handcrafted/Display/descriptors/NavDisplay.csd:
+        * examples/handcrafted/Display/descriptors/NavDisplay.ssd:
+        * examples/handcrafted/Display/descriptors/NavDisplayGUI.csd:
+        * examples/handcrafted/Display/descriptors/RateGen.csd:
+        * examples/handcrafted/Display/descriptors/RateGen.ssd:
+        * examples/handcrafted/Display/descriptors/RemoteDisplay.cad:
+        * examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad:
+        * examples/handcrafted/Hello/hello.csd:
+        * examples/handcrafted/Hello/hello.ssd:
+
+          Modified the files to point to the correct DTDs. Also added a
+          note to make sure that noone changes the path to the DTD by
+          mistake.
+
+        * tools/XML_Helpers/svc.conf.xml:
+
+          Fixed some errors in the file to allow parsing with the new
+          parser.
+
+
 Tue May 27 18:23:53 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * examples/handcrafted/BasicSP/BMClosedED/BMClosedED.cidl:
@@ -24,7 +65,7 @@ Tue May 27 09:57:24 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 	* examples/handcrafted/Display/NavDisplayGUI_exec/moc_RootPanel.cpp:
 	  Removed these Qt generated files.  Andrey fixed the mpc file for
 	  this component so they will be generated on the fly.
-	
+
 Mon May 26 21:34:48 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tools/Simple_Component_Server/Simple_Component_Server.cpp:
diff --git a/TAO/CIAO/docs/XML/componentassembly.dtd b/TAO/CIAO/docs/XML/componentassembly.dtd
index 38fdb7e7dc3..dbdf917d44b 100644
--- a/TAO/CIAO/docs/XML/componentassembly.dtd
+++ b/TAO/CIAO/docs/XML/componentassembly.dtd
@@ -138,7 +138,7 @@
 <!ELEMENT executableplacement
     ( usagename?
     , componentfileref
-    , componentimplref ?
+    , componentimplref?
     , invocation?
     , destination?
     , extension*
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.csd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.csd
index 6dcb0f0c54a..e814dfcbc13 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.csd
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.csd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- GPS's Software Package Descriptor  -->
 <!-- This file describes various GPS executor -->
@@ -18,7 +19,7 @@
   <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"/>
+    <fileinarchive name="BMClosedED.idl"/>
   </idl>
 
   <descriptor type="CORBA Component">
@@ -27,18 +28,18 @@
 
   <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>
+    <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>
+    <code type="DLL">
+      <fileinarchive name="BMClosedED_exec"/>
+      <entrypoint>createBMClosedEDHome_Impl</entrypoint>
+    </code>
 
   </implementation>
 
-</softpkg>
\ No newline at end of file
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.ssd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.ssd
index f455966e941..8ef62ebaa1c 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.ssd
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMClosedED.ssd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- RateGen's Servant Software Descriptor  -->
 <!-- This file describes various RateGen servant -->
@@ -39,4 +40,4 @@
 
   </implementation>
 
-</softpkg>
\ No newline at end of file
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.csd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.csd
index 91205bdeb82..d4ae1236c6c 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.csd
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.csd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- GPS's Software Package Descriptor  -->
 <!-- This file describes various GPS executor -->
@@ -42,4 +43,4 @@
 
   </implementation>
 
-</softpkg>
\ No newline at end of file
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.ssd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.ssd
index 5a63ed31c88..500a6284df0 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.ssd
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDevice.ssd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- RateGen's Servant Software Descriptor  -->
 <!-- This file describes various RateGen servant -->
@@ -39,4 +40,4 @@
 
   </implementation>
 
-</softpkg>
\ No newline at end of file
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.csd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.csd
index 31c4367ddcd..1f1d5ff0060 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.csd
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.csd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- GPS's Software Package Descriptor  -->
 <!-- This file describes various GPS executor -->
@@ -42,4 +43,4 @@
 
   </implementation>
 
-</softpkg>
\ No newline at end of file
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.ssd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.ssd
index 773134dce15..37949ebccb6 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.ssd
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BMDisplay.ssd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- RateGen's Servant Software Descriptor  -->
 <!-- This file describes various RateGen servant -->
@@ -39,4 +40,4 @@
 
   </implementation>
 
-</softpkg>
\ No newline at end of file
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BasicSP.cad b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BasicSP.cad
index c15909d1acd..bd727f4475c 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BasicSP.cad
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/BasicSP.cad
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE componentassembly SYSTEM "$(CIAO_ROOT)/docs/XML/componentassembly.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
 
 <componentassembly id="Single-process Basic assembly">
   <componentfiles>
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.csd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.csd
index e75cf833694..562ac252743 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.csd
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.csd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- RateGen's Software Package Descriptor  -->
 <!-- This file describes various RateGen executor -->
@@ -10,7 +11,7 @@
 
 <softpkg name="CIAO-EC" version="1.0">
   <pkgtype>CORBA Component</pkgtype>
-  <title>Event Generator</title>
+  <title>EC</title>
   <author>
     <company>ISIS at Vanderbilt University</company>
     <webpage href="http://www.dre.vanderbilt.edu/"/>
@@ -42,4 +43,4 @@
 
   </implementation>
 
-</softpkg>
\ No newline at end of file
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.ssd b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.ssd
index 71aa7ac5d94..02110072580 100644
--- a/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.ssd
+++ b/TAO/CIAO/examples/handcrafted/BasicSP/descriptors/EC.ssd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- RateGen's Servant Software Descriptor  -->
 <!-- This file describes various RateGen servant -->
@@ -39,4 +40,4 @@
 
   </implementation>
 
-</softpkg>
\ No newline at end of file
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/DuelDisplay.cad b/TAO/CIAO/examples/handcrafted/Display/descriptors/DuelDisplay.cad
index a5bfb59ca80..6707868b2cc 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/DuelDisplay.cad
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/DuelDisplay.cad
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE componentassembly SYSTEM "$(CIAO_ROOT)/docs/XML/componentassembly.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
 
 <componentassembly id="Single-process HUDisplay assembly">
   <componentfiles>
@@ -110,4 +111,4 @@
 
   </connections>
 
-</componentassembly>
\ No newline at end of file
+</componentassembly>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS.csd b/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS.csd
index a6e17406f41..bfa23d08744 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS.csd
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS.csd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- GPS's Software Package Descriptor  -->
 <!-- This file describes various GPS executor -->
@@ -60,4 +61,4 @@
   <!-- 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
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS.ssd b/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS.ssd
index b68e7c62648..5e33124bf1a 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS.ssd
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS.ssd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- GPS's Servant Software Descriptor  -->
 <!-- This file describes various GPS servant -->
@@ -44,4 +45,4 @@
   <!-- 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
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS_tracing.csd b/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS_tracing.csd
index 894ccca55a7..5835d632f97 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS_tracing.csd
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/GPS_tracing.csd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- GPS's Software Package Descriptor  -->
 <!-- This file describes various GPS executor -->
@@ -60,4 +61,4 @@
   <!-- 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
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplay.cad b/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplay.cad
index 9410aab95ba..00fef2cea5f 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplay.cad
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplay.cad
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE componentassembly SYSTEM "$(CIAO_ROOT)/docs/XML/componentassembly.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
 
 <componentassembly id="Single-process HUDisplay assembly">
   <componentfiles>
@@ -78,4 +79,4 @@
 
   </connections>
 
-</componentassembly>
\ No newline at end of file
+</componentassembly>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplayGUI.cad b/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplayGUI.cad
index d4252fe4cb8..29ba52d8768 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplayGUI.cad
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/HUDisplayGUI.cad
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE componentassembly SYSTEM "$(CIAO_ROOT)/docs/XML/componentassembly.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
 
 <componentassembly id="Single-process HUDisplay assembly">
   <componentfiles>
@@ -78,4 +79,4 @@
 
   </connections>
 
-</componentassembly>
\ No newline at end of file
+</componentassembly>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplay.csd b/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplay.csd
index 4d32cf58851..3384b95480d 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplay.csd
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplay.csd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- NavDisplay's Software Package Descriptor  -->
 <!-- This file describes various NavDisplay executor -->
@@ -60,4 +61,4 @@
   <!-- 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
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplay.ssd b/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplay.ssd
index f1e16629f90..b82967b411d 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplay.ssd
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplay.ssd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- NavDisplay's Servant Software Descriptor  -->
 <!-- This file describes various NavDisplay servant -->
@@ -44,4 +45,4 @@
   <!-- 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
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplayGUI.csd b/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplayGUI.csd
index fb3895c27ca..c19bb01a68c 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplayGUI.csd
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/NavDisplayGUI.csd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- NavDisplay's Software Package Descriptor  -->
 <!-- This file describes various NavDisplay executor -->
@@ -60,4 +61,4 @@
   <!-- 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
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/RateGen.csd b/TAO/CIAO/examples/handcrafted/Display/descriptors/RateGen.csd
index 37d60c4ed1a..756960b7eaa 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/RateGen.csd
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/RateGen.csd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- RateGen's Software Package Descriptor  -->
 <!-- This file describes various RateGen executor -->
@@ -60,4 +61,4 @@
   <!-- 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
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/RateGen.ssd b/TAO/CIAO/examples/handcrafted/Display/descriptors/RateGen.ssd
index 670969c7ff2..b18c9f5f235 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/RateGen.ssd
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/RateGen.ssd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../../docs/XML/softpkg.dtd">
 
 <!-- RateGen's Servant Software Descriptor  -->
 <!-- This file describes various RateGen servant -->
@@ -44,4 +45,4 @@
   <!-- 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
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplay.cad b/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplay.cad
index 42fe7c9c83e..e0c62e29918 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplay.cad
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplay.cad
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE componentassembly SYSTEM "$(CIAO_ROOT)/docs/XML/componentassembly.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
 
 <componentassembly id="Single-process HUDisplay assembly">
   <componentfiles>
@@ -80,4 +81,4 @@
 
   </connections>
 
-</componentassembly>
\ No newline at end of file
+</componentassembly>
diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad b/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad
index 414b1cef160..e26597bc426 100644
--- a/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad
+++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/RemoteDisplayGUI.cad
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE componentassembly SYSTEM "$(CIAO_ROOT)/docs/XML/componentassembly.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE componentassembly SYSTEM "../../../../docs/XML/componentassembly.dtd">
 
 <componentassembly id="Single-process HUDisplay assembly">
   <componentfiles>
@@ -80,4 +81,4 @@
 
   </connections>
 
-</componentassembly>
\ No newline at end of file
+</componentassembly>
diff --git a/TAO/CIAO/examples/handcrafted/Hello/hello.csd b/TAO/CIAO/examples/handcrafted/Hello/hello.csd
index 771b36beae7..92d4601d3a2 100644
--- a/TAO/CIAO/examples/handcrafted/Hello/hello.csd
+++ b/TAO/CIAO/examples/handcrafted/Hello/hello.csd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../docs/XML/softpkg.dtd">
 
 <!-- Hello World's Software Package Descriptor  -->
 <!-- This file describes various HelloWorld executor -->
@@ -71,4 +72,4 @@
   <!-- 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
+</softpkg>
diff --git a/TAO/CIAO/examples/handcrafted/Hello/hello.ssd b/TAO/CIAO/examples/handcrafted/Hello/hello.ssd
index d06a89f13a7..76b4247da2a 100644
--- a/TAO/CIAO/examples/handcrafted/Hello/hello.ssd
+++ b/TAO/CIAO/examples/handcrafted/Hello/hello.ssd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?> <!-- -*- SGML -*-  -->
 
-<!-- XML doesn't really support the following $(CIAO_ROOT) syntax :) -->
-<!DOCTYPE softpkg SYSTEM "$(CIAO_ROOT)/docs/XML/softpkg.dtd">
+<!-- If this file is moved to a different directory, make sure to change the
+     path to the DTD below. Otherwise the examples won't work. -->
+<!DOCTYPE softpkg SYSTEM "../../../docs/XML/softpkg.dtd">
 
 <!-- Hello World's Servant Software Descriptor  -->
 <!-- This file describes various HelloWorld servant -->
@@ -49,4 +50,4 @@
   <!-- 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
+</softpkg>
diff --git a/TAO/CIAO/tools/XML_Helpers/svc.conf.xml b/TAO/CIAO/tools/XML_Helpers/svc.conf.xml
index 152f3b44406..059b0447a56 100644
--- a/TAO/CIAO/tools/XML_Helpers/svc.conf.xml
+++ b/TAO/CIAO/tools/XML_Helpers/svc.conf.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!-- This is a test XML file.  Most of the stuff here don't make any sense at all -->
-<!DOCTYPE ACE_Svc_Conf PUBLIC 'GOODSAM' 'http://ace.cs.wustl.edu/dtd/ACE_SVCCONF.DTD'
+<!DOCTYPE ACE_Svc_Conf PUBLIC 'GOODSAM' '../../../../ACEXML/apps/svcconf/svcconf.dtd'
   [
     <!NOTATION goody PUBLIC 'NBC' 'http://hardcoreace.com/'>
     <!NOTATION frodo PUBLIC 'ABC'>
     <!NOTATION bilbo SYSTEM "C:/ACE-GUIDELINE">
     <!ENTITY ccm 'CCM_App'>
-    <!ENTITY pippin PUBLIC 'GOTO' 'http://taozen.com/' NDATA NBC>
+    <!ENTITY pippin PUBLIC 'GOTO' 'http://taozen.com/' NDATA goody>
     <!ENTITY sam PUBLIC 'SHIRE' 'http://taozen.com/'>
     <!ENTITY gandolf SYSTEM 'D:/RINGS.DOT'>
     <!ELEMENT GOOBEGONE EMPTY>