ChangeLogTag: Fri Feb 6 20:28:09 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

22 files changed, 434 insertions, 487 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index f8d03321b40..5c5d45b2ba9 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,19 +1,51 @@
+Fri Feb  6 20:28:09 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/bin/PythonDAnCE/generator/comp_impl.py:
+        
+          Fixes that should have been in previous commit. 
+        
+        * examples/Null_Component/Null_Component_exec.h:
+        * examples/Null_Component/Null_Component_exec.cpp:
+        * examples/Null_Component/descriptors/NodeMap.dat:
+        * examples/Null_Component/descriptors/Null_Homed.cdp:
+        * examples/Null_Component/descriptors/Null_Unhomed.cdp:
+        * examples/Null_Component/descriptors/run_test.pl:
+        
+          Ported this example to new CIAO/DAnCE.
+        
+        * examples/Null_Component/descriptors/Deployment.xsd:
+        * examples/Null_Component/descriptors/Domain.cdd:
+        * examples/Null_Component/descriptors/Null_Assembly.cid:
+        * examples/Null_Component/descriptors/Null_Assembly_Package.cpd:
+        * examples/Null_Component/descriptors/Null_Component.ccd:
+        * examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid:
+        * examples/Null_Component/descriptors/Null_Component_Package.cpd:
+        * examples/Null_Component/descriptors/Null_Component_exec.iad:
+        * examples/Null_Component/descriptors/Null_Component_stub.iad:
+        * examples/Null_Component/descriptors/Null_Component_svnt.iad:
+        * examples/Null_Component/descriptors/PackageConfiguration.pcd:
+        * examples/Null_Component/descriptors/Plan.cdp:
+        * examples/Null_Component/descriptors/TopLevelPackage.tpd:
+        * examples/Null_Component/descriptors/XMI.xsd:
+
+          Removed these files.
+
 Fri Feb  6 19:51:02 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/bin/PythonDAnCE/generator/comp_impl.py:
         * DAnCE/bin/PythonDAnCE/generator/home_impl.py:
         * DAnCE/bin/generate_plan.py:
-        
-          Fixes to better handle namespaces components may be declared in. 
-        
+
+          Fixes to better handle namespaces components may be declared in.
+
         * examples/BasicSP/descriptors/run_test.pl:
-          
-          Will run plan specified on commad line. 
-        
+
+          Will run plan specified on commad line.
+
         * examples/BasicSP/descriptors/BasicSP_Homed.cdp:
-        
-          Same as the _Unhomed plan, except all components are explicitly homed. 
-        
+
+          Same as the _Unhomed plan, except all components are explicitly homed.
+
 Fri Feb  6 19:36:03 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp:
diff --git a/flat/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_impl.py b/flat/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_impl.py
index eaf2ff52d68..e807fc6f58a 100755
--- a/flat/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_impl.py
+++ b/flat/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_impl.py
@@ -1,7 +1,7 @@
 from templet import stringfunction
 
 @stringfunction
-def template (component_name) :
+def template (component_name, namespace) :
     """
 
   <implementation xmi:id="${component_name}ComponentImplementation">
diff --git a/flat/CIAO/examples/Null_Component/Null_Component_exec.cpp b/flat/CIAO/examples/Null_Component/Null_Component_exec.cpp
index 89b16cbe55d..3aedbc6ce93 100644
--- a/flat/CIAO/examples/Null_Component/Null_Component_exec.cpp
+++ b/flat/CIAO/examples/Null_Component/Null_Component_exec.cpp
@@ -107,6 +107,20 @@ namespace CIDL_Null_Component_Impl
     // Your code here.
   }
 
+  extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Null_Component_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_RETURN (
+      retval,
+      Null_Component_exec_i,
+      ::Components::EnterpriseComponent::_nil ());
+
+    return retval;
+  }
+
   //==================================================================
   // Home Executor Implementation Class:   Null_ComponentHome_exec_i
   //==================================================================
diff --git a/flat/CIAO/examples/Null_Component/Null_Component_exec.h b/flat/CIAO/examples/Null_Component/Null_Component_exec.h
index 97fe1a4775e..fb0bc6c6edf 100644
--- a/flat/CIAO/examples/Null_Component/Null_Component_exec.h
+++ b/flat/CIAO/examples/Null_Component/Null_Component_exec.h
@@ -83,6 +83,9 @@ namespace CIDL_Null_Component_Impl
     ::CCM_Null_Component_Context_var context_;
   };
 
+  extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Null_Component_Impl (void);
+
   class NULL_COMPONENT_EXEC_Export Null_ComponentHome_exec_i
     : public virtual Null_ComponentHome_Exec,
       public virtual ::CORBA::LocalObject
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Deployment.xsd b/flat/CIAO/examples/Null_Component/descriptors/Deployment.xsd
deleted file mode 100644
index fd4ffe5bc7d..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Deployment.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
-            xmlns:Deployment="http://www.omg.org/Deployment"
-            targetNamespace="http://www.omg.org/Deployment">
-
-            <xsd:include schemaLocation="Basic_Deployment_Data.xsd"/>
-            <xsd:include schemaLocation="cpd.xsd"/>
-            <xsd:include schemaLocation="ccd.xsd"/>
-            <xsd:include schemaLocation="cdd.xsd"/>
-            <xsd:include schemaLocation="cdp.xsd"/>
-            <xsd:include schemaLocation="cid.xsd"/>
-            <xsd:include schemaLocation="iad.xsd"/>
-            <xsd:include schemaLocation="pcd.xsd"/>
-            <xsd:include schemaLocation="toplevel.xsd"/>
-
-
-<!-- Top-level elements. -->
-
-  <xsd:element name="domain" type="Deployment:Domain"/>
-  <xsd:element name="deploymentPlan" type="Deployment:DeploymentPlan"/>
-  <xsd:element name="implementationArtifactDescription" type="Deployment:ImplementationArtifactDescription" />
-  <xsd:element name="componentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/>
-  <xsd:element name="componentImplementationDescription" type="Deployment:ComponentImplementationDescription"/>
-  <xsd:element name="componentPackageDescription" type="Deployment:ComponentPackageDescription"/>
-  <xsd:element name="packageConfiguration" type="Deployment:PackageConfiguration"/>
-  <xsd:element name="topLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/>
-
-</xsd:schema>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Domain.cdd b/flat/CIAO/examples/Null_Component/descriptors/Domain.cdd
deleted file mode 100644
index b54b660bb7a..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Domain.cdd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:domain xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>E6198ADF-7421-46D8-9C4F-F70273837DAF</UUID>
-
-  <node>
-    <name>NodeA</name>
-  </node>
-
-</Deployment:domain>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/NodeMap.dat b/flat/CIAO/examples/Null_Component/descriptors/NodeMap.dat
index 1e920ef3e77..51d8967c561 100644
--- a/flat/CIAO/examples/Null_Component/descriptors/NodeMap.dat
+++ b/flat/CIAO/examples/Null_Component/descriptors/NodeMap.dat
@@ -1 +1 @@
-NodeA corbaloc:iiop:localhost:10000/NodeManager
\ No newline at end of file
+NodeOne corbaloc:iiop:localhost:10000/NodeManager
\ No newline at end of file
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid b/flat/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid
deleted file mode 100644
index 0b0d999c161..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:componentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>AB4E18C0-187E-4FEF-95FE-462E199411E5</UUID>
-
-  <assemblyImpl>
-    <instance id="_6B477FA1-2C04-423B-9580-A2997DEA6ADD">
-      <name>Null_Component.ComponentImplementations.Null_Assembly_Container.Null_Assembly.Null_Component</name>
-      <basePackage href="Null_Component_Package.cpd"/>
-    </instance>
-  </assemblyImpl>
-
-</Deployment:componentImplementationDescription>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd b/flat/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd
deleted file mode 100644
index 8650f99341a..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:componentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>051F0532-FC77-4867-8B97-58A8B1AC2692</UUID>
-
-  <implementation>
-    <name>Null_Component.ComponentImplementations.Null_Assembly_Container.Null_Assembly</name>
-    <referencedImplementation href="Null_Assembly.cid"/>
-  </implementation>
-
-</Deployment:componentPackageDescription>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Null_Component.ccd b/flat/CIAO/examples/Null_Component/descriptors/Null_Component.ccd
deleted file mode 100644
index c728a17f876..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Null_Component.ccd
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:componentInterfaceDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>1E762719-4310-41B5-ADC0-084D15E4DA91</UUID>
-
-  <specificType>IDL:Null_Component:1.0</specificType>
-
-  <supportedType>IDL:Null_Component:1.0</supportedType>
-
-  <supportedType>IDL:omg.org/Components/Navigation:1.0</supportedType>
-
-  <supportedType>IDL:omg.org/Components/Receptacles:1.0</supportedType>
-
-  <supportedType>IDL:omg.org/Components/Events:1.0</supportedType>
-
-  <supportedType>IDL:omg.org/Components/CCMObject:1.0</supportedType>
-
-  <supportedType>IDL:omg.org/CORBA/Object:1.0</supportedType>
-
-  <idlFile>Null_Component.idl</idlFile>
-
-  <port>
-    <name>null_facet</name>
-    <specificType>IDL:Null_Interface:1.0</specificType>
-    <supportedType>IDL:Null_Interface:1.0</supportedType>
-    <supportedType>IDL:omg.org/CORBA/Object:1.0</supportedType>
-    <provider>true</provider>
-    <exclusiveProvider>false</exclusiveProvider>
-    <exclusiveUser>false</exclusiveUser>
-    <optional>false</optional>
-    <kind>Facet</kind>
-  </port>
-
-</Deployment:componentInterfaceDescription>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid b/flat/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid
deleted file mode 100644
index 4e37e838af9..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:componentImplementationDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>DB0165FE-599E-485B-844E-E8D4C1FA3951</UUID>
-
-  <implements href="Null_Component.ccd"/>
-
-  <monolithicImpl>
-    <primaryArtifact>
-      <name>Null_Component.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_stub</name>
-      <referencedArtifact href="Null_Component_stub.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>Null_Component.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_svnt</name>
-      <referencedArtifact href="Null_Component_svnt.iad"/>
-    </primaryArtifact>
-    <primaryArtifact>
-      <name>Null_Component.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_exec</name>
-      <referencedArtifact href="Null_Component_exec.iad"/>
-    </primaryArtifact>
-  </monolithicImpl>
-
-  <configProperty>
-    <name>ComponentIOR</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component.ior</string>
-      </value>
-    </value>
-  </configProperty>
-
-</Deployment:componentImplementationDescription>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd b/flat/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd
deleted file mode 100644
index 4f450e87398..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:componentPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>FDCE9BA7-20C4-44B0-B1FB-10CC18EC1DB2</UUID>
-
-  <realizes href="Null_Component.ccd"/>
-
-  <implementation>
-    <name>Null_Component.ComponentImplementations.Null_ComponentImplementation.Null_ComponentMonolithicImpl</name>
-    <referencedImplementation href="Null_ComponentMonolithicImpl.cid"/>
-  </implementation>
-
-</Deployment:componentPackageDescription>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad b/flat/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad
deleted file mode 100644
index 1c8c34d20c2..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:implementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>7D050E10-E0DC-4A7A-810D-E847ED9ACC04</UUID>
-
-  <location>Null_Component_exec</location>
-
-  <dependsOn>
-    <name>Null_Component.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_svnt</name>
-    <referencedArtifact href="Null_Component_svnt.iad"/>
-  </dependsOn>
-
-  <dependsOn>
-    <name>Null_Component.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_stub</name>
-    <referencedArtifact href="Null_Component_stub.iad"/>
-  </dependsOn>
-
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_ComponentHome_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>architecture</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>x86</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>artifactVersion</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>0.0.0.0</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>configuration</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Release</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>operatingSystem</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Linux</string>
-      </value>
-    </value>
-  </execParameter>
-
-</Deployment:implementationArtifactDescription>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad b/flat/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad
deleted file mode 100644
index 034c4953e8b..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:implementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>F8CECE24-F3D4-4162-9A28-1CC7FA48C01B</UUID>
-
-  <location>Null_Component_stub</location>
-
-  <execParameter>
-    <name>architecture</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>x86</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>artifactVersion</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>0.0.0.0</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>configuration</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Release</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>operatingSystem</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Linux</string>
-      </value>
-    </value>
-  </execParameter>
-
-</Deployment:implementationArtifactDescription>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad b/flat/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad
deleted file mode 100644
index 8484f7a9a13..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:implementationArtifactDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>6DCFFB72-08DB-4546-B206-13B6AC2DB251</UUID>
-
-  <location>Null_Component_svnt</location>
-
-  <dependsOn>
-    <name>Null_Component.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_stub</name>
-    <referencedArtifact href="Null_Component_stub.iad"/>
-  </dependsOn>
-
-  <execParameter>
-    <name>entryPoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_ComponentHome_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>architecture</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>x86</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>artifactVersion</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>0.0.0.0</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>configuration</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Release</string>
-      </value>
-    </value>
-  </execParameter>
-
-  <execParameter>
-    <name>operatingSystem</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Linux</string>
-      </value>
-    </value>
-  </execParameter>
-
-</Deployment:implementationArtifactDescription>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp b/flat/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp
new file mode 100644
index 00000000000..2332e2d346e
--- /dev/null
+++ b/flat/CIAO/examples/Null_Component/descriptors/Null_Homed.cdp
@@ -0,0 +1,109 @@
+<Deployment:DeploymentPlan
+  xmlns:Deployment="http://www.omg.org/Deployment"
+  xmlns:xmi="http://www.omg.org/XMI"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+  <label>Null_Homed</label>
+  <UUID>Null_Homed</UUID>
+<implementation xmi:id="Null_ComponentHomeImplementation">
+  <name>Null_ComponentHomeImplementation</name>
+  <source/>
+  <artifact xmi:idref="Null_Component_ExecArtifact" />
+  <artifact xmi:idref="Null_Component_SvntArtifact" />
+  <execParameter>
+    <!-- entrypoint as exec parameter (see 10.6.1) -->
+    <name>home factory</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>create_Null_ComponentHome_Impl</string>
+      </value>
+    </value>
+  </execParameter>
+  <execParameter>
+    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>create_Null_ComponentHome_Servant</string>
+      </value>
+    </value>
+  </execParameter>
+  <execParameter>
+    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>Null_Component_svnt</string>
+      </value>
+    </value>
+  </execParameter>
+  <execParameter>
+    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>Null_Component_exec</string>
+      </value>
+    </value>
+  </execParameter>
+</implementation>
+<implementation xmi:id="Null_ComponentComponentImplementation">
+  <name>Null_ComponentComponentImplementation</name>
+  <source/>
+  <artifact xmi:idref="Null_Component_ExecArtifact" />
+  <artifact xmi:idref="Null_Component_SvntArtifact" />
+  <artifact xmi:idref="Null_Component_StubArtifact" />
+</implementation>    
+  <instance xmi:id="Null_ComponentHomeInstance">
+  <name>Null_ComponentHome</name>
+  <node>NodeOne</node>
+  <!-- hostname -->
+  <source/>
+  <implementation xmi:idref="Null_ComponentHomeImplementation" />
+</instance>
+  <instance xmi:id="Null_ComponentComponentInstance">
+  <name>Null_ComponentComponent</name>
+  <node>NodeOne</node>
+  <!-- hostname -->
+  <source/>
+  <implementation xmi:idref="Null_ComponentComponentImplementation" />
+  <configProperty>
+    <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>Null_ComponentHome</string>
+      </value>
+    </value>
+  </configProperty>
+</instance>
+  <artifact xmi:id="Null_Component_ExecArtifact">
+  <name>Null_Component_exec</name>
+  <source/>
+  <node/>
+  <location>Null_Component_exec</location>
+</artifact>
+<artifact xmi:id="Null_Component_SvntArtifact">
+  <name>Null_Component_svnt</name>
+  <source/>
+  <node/>
+  <location>Null_Component_svnt</location>
+</artifact>
+<artifact xmi:id="Null_Component_StubArtifact">
+  <name>Null_Component_stub</name>
+  <source/>
+  <node/>
+  <location>Null_Component_stub</location>
+</artifact>  
+</Deployment:DeploymentPlan>
\ No newline at end of file
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Null_Unhomed.cdp b/flat/CIAO/examples/Null_Component/descriptors/Null_Unhomed.cdp
new file mode 100644
index 00000000000..c259d000b9e
--- /dev/null
+++ b/flat/CIAO/examples/Null_Component/descriptors/Null_Unhomed.cdp
@@ -0,0 +1,85 @@
+<Deployment:DeploymentPlan
+  xmlns:Deployment="http://www.omg.org/Deployment"
+  xmlns:xmi="http://www.omg.org/XMI"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+  <label>Null_Homed</label>
+  <UUID>Null_Homed</UUID>
+
+<implementation xmi:id="Null_ComponentComponentImplementation">
+  <name>Null_ComponentComponentImplementation</name>
+  <source/>
+  <artifact xmi:idref="Null_Component_ExecArtifact" />
+  <artifact xmi:idref="Null_Component_SvntArtifact" />
+  <execParameter>
+    <!-- entrypoint as exec parameter (see 10.6.1) -->
+    <name>component factory</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>create_Null_Component_Impl</string>
+      </value>
+    </value>
+  </execParameter>
+  <execParameter>
+    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>create_Null_Component_Servant</string>
+      </value>
+    </value>
+  </execParameter>
+  <execParameter>
+    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>Null_Component_svnt</string>
+      </value>
+    </value>
+  </execParameter>
+  <execParameter>
+    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+    <value>
+      <type>
+        <kind>tk_string</kind>
+      </type>
+      <value>
+        <string>Null_Component_exec</string>
+      </value>
+    </value>
+  </execParameter>
+</implementation>
+<instance xmi:id="Null_ComponentComponentInstance">
+  <name>Null_ComponentComponent</name>
+  <node>NodeOne</node>
+  <!-- hostname -->
+  <source/>
+  <implementation xmi:idref="Null_ComponentComponentImplementation" />
+</instance>
+  <artifact xmi:id="Null_Component_ExecArtifact">
+  <name>Null_Component_exec</name>
+  <source/>
+  <node/>
+  <location>Null_Component_exec</location>
+</artifact>
+<artifact xmi:id="Null_Component_SvntArtifact">
+  <name>Null_Component_svnt</name>
+  <source/>
+  <node/>
+  <location>Null_Component_svnt</location>
+</artifact>
+<artifact xmi:id="Null_Component_StubArtifact">
+  <name>Null_Component_stub</name>
+  <source/>
+  <node/>
+  <location>Null_Component_stub</location>
+</artifact>  
+</Deployment:DeploymentPlan>
\ No newline at end of file
diff --git a/flat/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd b/flat/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd
deleted file mode 100644
index 0ed852e5164..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:packageConfiguration xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>168FF6BD-40CF-4A06-A380-66266A32F168</UUID>
-
-  <basePackage href="Null_Assembly_Package.cpd"/>
-
-</Deployment:packageConfiguration>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/Plan.cdp b/flat/CIAO/examples/Null_Component/descriptors/Plan.cdp
deleted file mode 100644
index 4389f295e1d..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/Plan.cdp
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:deploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <UUID>FD6E278D-20AC-4FFD-B359-382963C5D9A1</UUID>
-
-  <implementation id="_DB0165FE-599E-485B-844E-E8D4C1FA3951">
-    <name>Null_Component.ComponentImplementations.Null_ComponentImplementation.Null_ComponentMonolithicImpl</name>
-    <source/>
-    <artifact>_F8CECE24-F3D4-4162-9A28-1CC7FA48C01B</artifact>
-    <artifact>_6DCFFB72-08DB-4546-B206-13B6AC2DB251</artifact>
-    <artifact>_7D050E10-E0DC-4A7A-810D-E847ED9ACC04</artifact>
-  </implementation>
-
-  <instance id="Null_Component.ComponentImplementations.Null_Assembly_Container.Null_Assembly.Null_Component">
-    <name>Null_Component.ComponentImplementations.Null_Assembly_Container.Null_Assembly.Null_Component</name>
-    <node>NodeA</node>
-    <source/>
-    <implementation>_DB0165FE-599E-485B-844E-E8D4C1FA3951</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Null_Component.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact id="_F8CECE24-F3D4-4162-9A28-1CC7FA48C01B">
-    <name>Null_Component.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_stub</name>
-    <source/>
-    <node/>
-    <location>Null_Component_stub</location>
-  </artifact>
-
-  <artifact id="_6DCFFB72-08DB-4546-B206-13B6AC2DB251">
-    <name>Null_Component.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Null_Component_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Null_ComponentHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="_7D050E10-E0DC-4A7A-810D-E847ED9ACC04">
-    <name>Null_Component.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_exec</name>
-    <source/>
-    <node/>
-    <location>Null_Component_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Null_ComponentHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-</Deployment:deploymentPlan>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/TopLevelPackage.tpd b/flat/CIAO/examples/Null_Component/descriptors/TopLevelPackage.tpd
deleted file mode 100644
index 8c4a5d46dba..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/TopLevelPackage.tpd
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Deployment:topLevelPackageDescription xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <basePackage href="PackageConfiguration.pcd"/>
-
-</Deployment:topLevelPackageDescription>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/XMI.xsd b/flat/CIAO/examples/Null_Component/descriptors/XMI.xsd
deleted file mode 100644
index f4adac91934..00000000000
--- a/flat/CIAO/examples/Null_Component/descriptors/XMI.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" ?>
-<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'>
-	<xsd:attribute name="id" type="xsd:ID" />
-	<xsd:attributeGroup name="IdentityAttribs">
-		<xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" />
-		<xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" />
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="LinkAttribs">
-		<xsd:attribute name="href" type="xsd:string" use="optional" />
-		<xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" />
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="ObjectAttribs">
-		<xsd:attributeGroup ref="xmi:IdentityAttribs" />
-		<xsd:attributeGroup ref="xmi:LinkAttribs" />
-		<xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" />
-		<xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" />
-	</xsd:attributeGroup>
-	<xsd:complexType name="Extension">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:any processContents="lax" />
-		</xsd:choice>
-		<xsd:attribute ref="xmi:id" />
-		<xsd:attributeGroup ref="xmi:ObjectAttribs" />
-		<xsd:attribute name="extender" type="xsd:string" use="optional" />
-		<xsd:attribute name="extenderID" type="xsd:string" use="optional" />
-	</xsd:complexType>
-	<xsd:element name="Extension" type="xmi:Extension" />
-	<xsd:complexType name="Any">
-		<xsd:choice maxOccurs="unbounded" minOccurs="0">
-			<xsd:any processContents="skip" />
-		</xsd:choice>
-		<xsd:anyAttribute processContents="skip" />
-	</xsd:complexType>
-</xsd:schema>
diff --git a/flat/CIAO/examples/Null_Component/descriptors/run_test.pl b/flat/CIAO/examples/Null_Component/descriptors/run_test.pl
new file mode 100755
index 00000000000..76b37e5a3bf
--- /dev/null
+++ b/flat/CIAO/examples/Null_Component/descriptors/run_test.pl
@@ -0,0 +1,180 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{'ACE_ROOT'}/bin";
+use PerlACE::Run_Test;
+
+$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
+$TAO_ROOT = "$ENV{'TAO_ROOT'}";
+$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE";
+$daemons_running = 0;
+$em_running = 0;
+$ns_running = 0;
+$daemons = 1;
+@ports = ( 60001 );
+@iorfiles = ( "NodeApp1.ior" );
+@nodenames = ( "NodeOne" );
+$status = 0;
+$dat_file = "NodeMap.dat";
+
+$nsior = PerlACE::LocalFile ("ns.ior");
+
+$E = 0;
+$EM = 0;
+$retval = 0;
+
+# Delete if there are any .ior files.
+sub delete_ior_files {
+    for ($i = 0; $i < $daemons; ++$i) {
+        unlink $iorfiles[$i];
+    }
+    unlink PerlACE::LocalFile ("EM.ior");
+    unlink PerlACE::LocalFile ("DAM.ior");
+    unlink PerlACE::LocalFile ("ns.ior");
+}
+
+sub kill_node_daemons {
+  for ($i = 0; $i < $daemons; ++$i) {
+    $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+  }
+}
+
+sub kill_open_processes {
+  if ($daemons_running == 1) {
+    kill_node_daemons ();
+  }
+
+  if ($em_running == 1) {
+    $EM->Kill ();
+    $EM->TimedWait (1);
+  }
+
+  if ($ns_running == 1) {
+    $NS->Kill ();
+    $NS->TimedWait (1);
+  }
+
+}
+
+sub run_node_daemons {
+  for ($i = 0; $i < $daemons; ++$i)
+  {
+      $iorfile = $iorfiles[$i];
+      $port = $ports[$i];
+      $nodename = $nodenames[$i];
+      $iiop = "iiop://localhost:$port";
+      $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
+
+      $d_cmd = "$DAnCE/bin/dance_node_manager";
+      $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService --instance-nc corbaloc:rir:/NameService";
+
+      $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
+      $result = $Daemons[$i]->Spawn ();
+      push(@processes, $Daemons[$i]);
+
+      if (PerlACE::waitforfile_timed ($iorfile,
+                                      30) == -1) {
+          print STDERR
+            "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
+          for (; $i >= 0; --$i) {
+            $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+          }
+          return -1;
+      }
+  }
+  return 0;
+}
+
+if ($#ARGV == -1)
+{
+    opendir(DIR, ".");
+    @files = grep(/\.cdp$/,readdir(DIR));
+    closedir(DIR);
+} else {
+    @files = @ARGV;
+}
+
+foreach $file (@files) {
+    print "Starting test for deployment $file\n";
+    delete_ior_files ();
+    
+    print STDERR "Starting Naming Service\n";
+    
+    $NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior");
+    $NS->Spawn ();
+    
+    if (PerlACE::waitforfile_timed ($nsior, $PerlACE::wait_interval_for_process_creation) == -1)
+    {
+        print STDERR "ERROR: cannot find naming service IOR file\n";
+        $NS->Kill ();
+        exit 1;
+    }
+    $ns_running = 1;
+
+# Set up NamingService environment
+    $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+    
+    
+# Invoke node daemons.
+    print "Invoking node daemons\n";
+    $status = run_node_daemons ();
+
+    if ($status != 0) {
+        print STDERR "ERROR: Unable to execute the node daemons\n";
+        kill_open_processes ();
+        exit 1;
+    }
+    
+    $daemons_running = 1;
+    
+    # Invoke execution manager.
+    print "Invoking execution manager\n";
+    $EM = new PerlACE::Process ("$DAnCE/bin/dance_execution_manager",
+                                "-eEM.ior --domain-nc corbaloc:rir:/NameService");
+    $EM->Spawn ();
+    
+    if (PerlACE::waitforfile_timed ("EM.ior",
+                                    $PerlACE::wait_interval_for_process_creation) == -1) {
+        print STDERR
+            "ERROR: The ior file of execution manager could not be found\n";
+        kill_open_processes ();
+        exit 1;
+    }
+    
+    $em_running = 1;
+
+# Invoke executor - start the application -.
+    print "Invoking executor - start the application -\n";
+    $E =
+	new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
+			      "-x $file -k file://EM.ior");
+    
+    $E->SpawnWaitKill (5000);
+    
+    if ($status != 0)
+    {
+        print "ERROR: dance_plan_launcher returned an error code while deploying $file\n";
+        $retval = -1;
+    }
+    
+    # Invoke executor - stop the application -.
+    print "Invoking executor - stop the application -\n";
+    $E =
+	new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
+			      "-k file://EM.ior -x $file -q");
+    $E->SpawnWaitKill (3000);
+    
+    print "Executor returned.\n";
+
+    delete_ior_files ();
+    kill_open_processes ();
+}
+
+delete_ior_files ();
+kill_open_processes ();
+
+exit $status;