ChangeLogTag: Thu Feb 5 00:39:48 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

9 files changed, 1181 insertions, 21 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 1a1f26c8266..279ec437b92 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,21 +1,37 @@
+Thu Feb  5 00:39:48 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp:
+        
+          Fixed a segmentation fault. 
+        
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp:
+        
+          Tests similar to those in NodeManager-Deployments, except across two nodes. 
+        
 Wed Feb  4 22:08:09 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp:
         * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp:
         * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp:
         * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp:
-        
+
           Removed CLINFO from the logging messages.
-        
+
         * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl:
 
           Test script to execute all deployments in this directory
 
         * tools/XML/XML_Helper.tpp:
         * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp:
-        
-          Reduced logging. 
-                
+
+          Reduced logging.
+
 Wed Feb  4 21:18:18 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * ciao/Containers/Container_Base.cpp:
diff --git a/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp
index e615cc12cd6..f8201a17fb9 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp
@@ -50,10 +50,8 @@ namespace CIDL_SimpleConsumer_Impl
     CIAO_TRACE ("SimpleConsumer_exec_i::push_hello_ ()");
     // Your code here.
     
-    ::Simple::Hello_var hello (ev);
-    
     CIAO_DEBUG ((LM_EMERGENCY, "SimpleConsumer_exec_i::push_hello_ - "
-                 "Received hell event, value is %s\n", ev->hello_ ()));
+                 "Received hello event, value is %s\n", ev->hello_ ()));
   }
 
   // Operations from Components::SessionComponent
diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp
new file mode 100644
index 00000000000..01c13b3f3d1
--- /dev/null
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome.cdp
@@ -0,0 +1,227 @@
+<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>SimpleComponent_Home</label>
+  <UUID>SimpleComponent_Home</UUID>
+
+  <!-- Implementations declarations -->
+
+  <!-- Home implementation -->
+  <implementation xmi:id="SimpleEmitterHomeImplementation">
+    <name>SimpleEmitterHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleEmitter_ExecArtifact" />
+    <artifact xmi:idref="SimpleEmitter_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>home factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleEmitterHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleEmitterHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleEmitter_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleEmitter_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="SimpleEmitterComponentImplementation">
+    <name>SimpleEmitterComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleEmitter_ExecArtifact" />
+    <artifact xmi:idref="SimpleEmitter_SvntArtifact" />
+  </implementation>
+
+  <implementation xmi:id="SimpleConsumerHomeImplementation">
+    <name>SimpleConsumerHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleConsumer_ExecArtifact" />
+    <artifact xmi:idref="SimpleConsumer_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>home factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleConsumerHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleConsumerHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleConsumer_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleConsumer_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="SimpleConsumerComponentImplementation">
+    <name>SimpleConsumerComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleConsumer_ExecArtifact" />
+    <artifact xmi:idref="SimpleConsumer_SvntArtifact" />
+  </implementation>
+
+  <instance xmi:id="SimpleEmitterHomeInstance">
+    <name>SimpleEmitterHome</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleEmitterHomeImplementation" />
+  </instance>
+
+  <instance xmi:id="SimpleEmitterComponentInstance">
+    <name>SimpleEmitterComponent</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleEmitterComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleEmitterHome</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="SimpleConsumerHomeInstance">
+    <name>SimpleConsumerHome</name>
+    <node>NodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleConsumerHomeImplementation" />
+  </instance>
+
+  <instance xmi:id="SimpleConsumerComponentInstance">
+    <name>SimpleConsumerComponent</name>
+    <node>NodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleConsumerComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleConsumerHome</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <connection>
+    <name>TestConnection</name>
+    <internalEndpoint>
+      <portName>hello</portName>
+      <provider>false</provider>
+      <kind>EventEmitter</kind>
+      <instance xmi:idref="SimpleEmitterComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>hello_</portName>
+      <provider>true</provider>
+      <kind>EventConsumer</kind>
+      <instance xmi:idref="SimpleConsumerComponentInstance" />
+    </internalEndpoint>
+  </connection>
+
+  <!-- Artifacts declarations -->
+  <artifact xmi:id="SimpleEmitter_ExecArtifact">
+    <name>SimpleEmitter_exec</name>
+    <source/>
+    <node/>
+    <location>SimpleEmitter_exec</location>
+  </artifact>
+  <artifact xmi:id="SimpleEmitter_SvntArtifact">
+    <name>SimpleEmitter_svnt</name>
+    <source/>
+    <node/>
+    <location>SimpleEmitter_svnt</location>
+  </artifact>
+
+  <artifact xmi:id="SimpleConsumer_ExecArtifact">
+    <name>SimpleConsumer_exec</name>
+    <source/>
+    <node/>
+    <location>SimpleConsumer_exec</location>
+  </artifact>
+  <artifact xmi:id="SimpleConsumer_SvntArtifact">
+    <name>SimpleConsumer_svnt</name>
+    <source/>
+    <node/>
+    <location>SimpleConsumer_svnt</location>
+  </artifact>
+
+  </Deployment:DeploymentPlan>
diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp
new file mode 100644
index 00000000000..c5bc81c852a
--- /dev/null
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome.cdp
@@ -0,0 +1,262 @@
+<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>SimpleComponent_Home</label>
+  <UUID>SimpleComponent_Home</UUID>
+
+  <!-- Implementations declarations -->
+
+  <!-- Home implementation -->
+  <implementation xmi:id="SimpleProviderHomeImplementation">
+    <name>SimpleProviderHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleProvider_ExecArtifact" />
+    <artifact xmi:idref="SimpleProvider_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>home factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleProviderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleProviderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleProvider_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleProvider_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="SimpleProviderComponentImplementation">
+    <name>SimpleProviderComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleProvider_ExecArtifact" />
+    <artifact xmi:idref="SimpleProvider_SvntArtifact" />
+  </implementation>
+
+  <implementation xmi:id="SimpleMultipleUserHomeImplementation">
+    <name>SimpleMultipleUserHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleMultipleUser_ExecArtifact" />
+    <artifact xmi:idref="SimpleMultipleUser_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>home factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleMultipleUserHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleMultipleUserHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleMultipleUser_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleMultipleUser_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="SimpleMultipleUserComponentImplementation">
+    <name>SimpleMultipleUserComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleMultipleUser_ExecArtifact" />
+    <artifact xmi:idref="SimpleMultipleUser_SvntArtifact" />
+  </implementation>
+
+  <instance xmi:id="SimpleProviderHomeInstance">
+    <name>SimpleProviderHome</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleProviderHomeImplementation" />
+  </instance>
+
+  <instance xmi:id="SimpleProviderComponentInstance">
+    <name>SimpleProviderComponent</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleProviderComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleProviderHome</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="SimpleMultipleUserHomeInstance">
+    <name>SimpleMultipleUserHome</name>
+    <node>NodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleMultipleUserHomeImplementation" />
+  </instance>
+
+  <instance xmi:id="SimpleMultipleUserComponentInstance">
+    <name>SimpleMultipleUserComponent</name>
+    <node>NodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleMultipleUserComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleMultipleUserHome</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <instance xmi:id="SimpleMultipleUserComponentInstanceReverse">
+    <name>SimpleMultipleUserComponentReverse</name>
+    <node>NodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleMultipleUserComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleMultipleUserHome</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <connection>
+    <name>TestConnection</name>
+    <internalEndpoint>
+      <portName>trig</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="SimpleProviderComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>trig</portName>
+      <provider>false</provider>
+      <kind>MultiplexReceptacle</kind>
+      <instance xmi:idref="SimpleMultipleUserComponentInstance" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>TestConnectionReverse</name>
+    <internalEndpoint>
+      <portName>trig</portName>
+      <provider>false</provider>
+      <kind>MultiplexReceptacle</kind>
+      <instance xmi:idref="SimpleMultipleUserComponentInstanceReverse" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>trig</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="SimpleProviderComponentInstance" />
+    </internalEndpoint>
+  </connection>
+
+  <!-- Artifacts declarations -->
+  <artifact xmi:id="SimpleProvider_ExecArtifact">
+    <name>SimpleProvider_exec</name>
+    <source/>
+    <node/>
+    <location>SimpleProvider_exec</location>
+  </artifact>
+  <artifact xmi:id="SimpleProvider_SvntArtifact">
+    <name>SimpleProvider_svnt</name>
+    <source/>
+    <node/>
+    <location>SimpleProvider_svnt</location>
+  </artifact>
+
+  <artifact xmi:id="SimpleMultipleUser_ExecArtifact">
+    <name>SimpleMultipleUser_exec</name>
+    <source/>
+    <node/>
+    <location>SimpleMultipleUser_exec</location>
+  </artifact>
+  <artifact xmi:id="SimpleMultipleUser_SvntArtifact">
+    <name>SimpleMultipleUser_svnt</name>
+    <source/>
+    <node/>
+    <location>SimpleMultipleUser_svnt</location>
+  </artifact>
+
+  </Deployment:DeploymentPlan>
diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp
new file mode 100644
index 00000000000..32747bfc1bf
--- /dev/null
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome.cdp
@@ -0,0 +1,227 @@
+<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>SimpleComponent_Home</label>
+  <UUID>SimpleComponent_Home</UUID>
+
+  <!-- Implementations declarations -->
+
+  <!-- Home implementation -->
+  <implementation xmi:id="SimplePublisherHomeImplementation">
+    <name>SimplePublisherHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimplePublisher_ExecArtifact" />
+    <artifact xmi:idref="SimplePublisher_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>home factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimplePublisherHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimplePublisherHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimplePublisher_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimplePublisher_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="SimplePublisherComponentImplementation">
+    <name>SimplePublisherComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimplePublisher_ExecArtifact" />
+    <artifact xmi:idref="SimplePublisher_SvntArtifact" />
+  </implementation>
+
+  <implementation xmi:id="SimpleConsumerHomeImplementation">
+    <name>SimpleConsumerHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleConsumer_ExecArtifact" />
+    <artifact xmi:idref="SimpleConsumer_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>home factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleConsumerHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleConsumerHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleConsumer_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleConsumer_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="SimpleConsumerComponentImplementation">
+    <name>SimpleConsumerComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleConsumer_ExecArtifact" />
+    <artifact xmi:idref="SimpleConsumer_SvntArtifact" />
+  </implementation>
+
+  <instance xmi:id="SimplePublisherHomeInstance">
+    <name>SimplePublisherHome</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimplePublisherHomeImplementation" />
+  </instance>
+
+  <instance xmi:id="SimplePublisherComponentInstance">
+    <name>SimplePublisherComponent</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimplePublisherComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimplePublisherHome</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="SimpleConsumerHomeInstance">
+    <name>SimpleConsumerHome</name>
+    <node>NodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleConsumerHomeImplementation" />
+  </instance>
+
+  <instance xmi:id="SimpleConsumerComponentInstance">
+    <name>SimpleConsumerComponent</name>
+    <node>NodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleConsumerComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleConsumerHome</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <connection>
+    <name>TestConnection</name>
+    <internalEndpoint>
+      <portName>hello</portName>
+      <provider>false</provider>
+      <kind>EventPublisher</kind>
+      <instance xmi:idref="SimplePublisherComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>hello_</portName>
+      <provider>true</provider>
+      <kind>EventConsumer</kind>
+      <instance xmi:idref="SimpleConsumerComponentInstance" />
+    </internalEndpoint>
+  </connection>
+
+  <!-- Artifacts declarations -->
+  <artifact xmi:id="SimplePublisher_ExecArtifact">
+    <name>SimplePublisher_exec</name>
+    <source/>
+    <node/>
+    <location>SimplePublisher_exec</location>
+  </artifact>
+  <artifact xmi:id="SimplePublisher_SvntArtifact">
+    <name>SimplePublisher_svnt</name>
+    <source/>
+    <node/>
+    <location>SimplePublisher_svnt</location>
+  </artifact>
+
+  <artifact xmi:id="SimpleConsumer_ExecArtifact">
+    <name>SimpleConsumer_exec</name>
+    <source/>
+    <node/>
+    <location>SimpleConsumer_exec</location>
+  </artifact>
+  <artifact xmi:id="SimpleConsumer_SvntArtifact">
+    <name>SimpleConsumer_svnt</name>
+    <source/>
+    <node/>
+    <location>SimpleConsumer_svnt</location>
+  </artifact>
+
+  </Deployment:DeploymentPlan>
diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp
index 5632d219c48..e9af75b1ac4 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleComponentExplicitHome.cdp
@@ -71,7 +71,7 @@
 
   <instance xmi:id="SimpleNullHomeInstance">
     <name>SimpleNullHome</name>
-    <node>Node</node>
+    <node>NodeOne</node>
     <!-- hostname -->
     <source/>
     <implementation xmi:idref="SimpleNullHomeImplementation" />
@@ -79,7 +79,7 @@
 
   <instance xmi:id="SimpleNullComponentInstance">
     <name>SimpleNullComponent</name>
-    <node>Node</node>
+    <node>NodeOne</node>
     <!-- hostname -->
     <source/>
     <implementation xmi:idref="SimpleNullComponentImplementation" />
diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp
new file mode 100644
index 00000000000..8283e9e869a
--- /dev/null
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome.cdp
@@ -0,0 +1,262 @@
+<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>SimpleComponent_Home</label>
+  <UUID>SimpleComponent_Home</UUID>
+
+  <!-- Implementations declarations -->
+
+  <!-- Home implementation -->
+  <implementation xmi:id="SimpleProviderHomeImplementation">
+    <name>SimpleProviderHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleProvider_ExecArtifact" />
+    <artifact xmi:idref="SimpleProvider_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>home factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleProviderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleProviderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleProvider_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleProvider_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="SimpleProviderComponentImplementation">
+    <name>SimpleProviderComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleProvider_ExecArtifact" />
+    <artifact xmi:idref="SimpleProvider_SvntArtifact" />
+  </implementation>
+
+  <implementation xmi:id="SimpleUserHomeImplementation">
+    <name>SimpleUserHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleUser_ExecArtifact" />
+    <artifact xmi:idref="SimpleUser_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>home factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleUserHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_SimpleUserHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleUser_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleUser_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="SimpleUserComponentImplementation">
+    <name>SimpleUserComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="SimpleUser_ExecArtifact" />
+    <artifact xmi:idref="SimpleUser_SvntArtifact" />
+  </implementation>
+
+  <instance xmi:id="SimpleProviderHomeInstance">
+    <name>SimpleProviderHome</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleProviderHomeImplementation" />
+  </instance>
+
+  <instance xmi:id="SimpleProviderComponentInstance">
+    <name>SimpleProviderComponent</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleProviderComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleProviderHome</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="SimpleUserHomeInstance">
+    <name>SimpleUserHome</name>
+    <node>NodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleUserHomeImplementation" />
+  </instance>
+
+  <instance xmi:id="SimpleUserComponentInstance">
+    <name>SimpleUserComponent</name>
+    <node>NodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleUserComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleUserHome</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <instance xmi:id="SimpleUserComponentInstanceReverse">
+    <name>SimpleUserComponentReverse</name>
+    <node>NodeTwo</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleUserComponentImplementation" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleUserHome</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  
+  <connection>
+    <name>TestConnection</name>
+    <internalEndpoint>
+      <portName>trig</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="SimpleProviderComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>trig</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="SimpleUserComponentInstance" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>TestConnectionReverse</name>
+    <internalEndpoint>
+      <portName>trig</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="SimpleUserComponentInstanceReverse" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>trig</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="SimpleProviderComponentInstance" />
+    </internalEndpoint>
+  </connection>
+
+  <!-- Artifacts declarations -->
+  <artifact xmi:id="SimpleProvider_ExecArtifact">
+    <name>SimpleProvider_exec</name>
+    <source/>
+    <node/>
+    <location>SimpleProvider_exec</location>
+  </artifact>
+  <artifact xmi:id="SimpleProvider_SvntArtifact">
+    <name>SimpleProvider_svnt</name>
+    <source/>
+    <node/>
+    <location>SimpleProvider_svnt</location>
+  </artifact>
+
+  <artifact xmi:id="SimpleUser_ExecArtifact">
+    <name>SimpleUser_exec</name>
+    <source/>
+    <node/>
+    <location>SimpleUser_exec</location>
+  </artifact>
+  <artifact xmi:id="SimpleUser_SvntArtifact">
+    <name>SimpleUser_svnt</name>
+    <source/>
+    <node/>
+    <location>SimpleUser_svnt</location>
+  </artifact>
+
+  </Deployment:DeploymentPlan>
diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
new file mode 100755
index 00000000000..e69442ce9d2
--- /dev/null
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
@@ -0,0 +1,168 @@
+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 = 2;
+@ports = ( 60001, 60002 );
+@iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" );
+@nodenames = ( "NodeOne", "NodeTwo" );
+$status = 0;
+$dat_file = "NodeManagerMap.dat";
+$controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
+
+$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 ("Receiver.ior");
+    unlink PerlACE::LocalFile ("Sender.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;
+}
+
+opendir(DIR, ".");
+@files = grep(/\.cdp$/,readdir(DIR));
+closedir(DIR);
+
+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 ("simple_em_launcher",
+                               "file://EM.ior $file");
+    
+    $status = $E->SpawnWaitKill (5000);
+    
+    if ($status != 0)
+    {
+        print "ERROR: simple_em_launcher returned an error code while deploying $file\n";
+        $retval = -1;
+    }
+
+    delete_ior_files ();
+    kill_open_processes ();
+}
+
+delete_ior_files ();
+kill_open_processes ();
+
+exit $status;
diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp
index 4da0a4512d8..5ca73df524c 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp
@@ -45,7 +45,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   
   try
     {
-      ACE_DEBUG ((LM_DEBUG, "*** simple_em_launcher: parsing XML\n"));
+      ACE_DEBUG ((LM_INFO, "*** simple_em_launcher: parsing XML\n"));
       // Parse plan
       CIAO::Config_Handlers::XML_File_Intf xml (argv[2]);
       xml.add_search_path ("CIAO_ROOT", "/docs/schema/");
@@ -59,7 +59,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
       
 
-      ACE_DEBUG ((LM_DEBUG, "*** simple_em_launcher: resoling execution manager reference.\n"));
+      ACE_DEBUG ((LM_INFO, "*** simple_em_launcher: resoling execution manager reference.\n"));
       CORBA::Object_var obj = orb->string_to_object (argv[1]);
       Deployment::ExecutionManager_var em = Deployment::ExecutionManager::_narrow (obj.in ());
       
@@ -69,33 +69,33 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           throw 1;
         }
 
-      ACE_DEBUG ((LM_DEBUG, "*** simple_em_launcher: calling prepareplan.\n"));
+      ACE_DEBUG ((LM_INFO, "*** simple_em_launcher: calling prepareplan.\n"));
       Deployment::DomainApplicationManager_var dam = em->preparePlan (*plan,
                                                                     Deployment::ResourceCommitmentManager::_nil ());
       
-      ACE_DEBUG ((LM_DEBUG, "*** simple_em_launcher: calling startLaunch\n"));
+      ACE_DEBUG ((LM_INFO, "*** simple_em_launcher: calling startLaunch\n"));
       Deployment::Connections_var conns;
       Deployment::Properties props;
       Deployment::Application_var app = dam->startLaunch (props, conns.out ());
       Deployment::DomainApplication_var da = Deployment::DomainApplication::_narrow (app.in ());
       
-      ACE_DEBUG ((LM_DEBUG, "*** simple_em_launcher: calling finishLaunch\n"));
+      ACE_DEBUG ((LM_INFO, "*** simple_em_launcher: calling finishLaunch\n"));
       da->finishLaunch (conns.in (), false);
       
-      ACE_DEBUG ((LM_DEBUG, "*** simple_em_launcher: calling start\n"));
+      ACE_DEBUG ((LM_INFO, "*** simple_em_launcher: calling start\n"));
       da->start ();
       
-      ACE_DEBUG ((LM_DEBUG, "*** simple_em_launcher: start finished, sleeping 20 seconds.\n"));
-      ACE_OS::sleep (20);
-      ACE_DEBUG ((LM_DEBUG, "*** simple_em_launcher: waking up from sleep, calling destroyApplication\n"));
+      ACE_DEBUG ((LM_INFO, "*** simple_em_launcher: start finished, sleeping 5 seconds.\n"));
+      ACE_OS::sleep (5);
+      ACE_DEBUG ((LM_INFO, "*** simple_em_launcher: waking up from sleep, calling destroyApplication\n"));
       
       dam->destroyApplication (da.in ());
       
-      ACE_DEBUG ((LM_DEBUG, "*** simple_em_launcher: calling destroyManager\n"));
+      ACE_DEBUG ((LM_INFO, "*** simple_em_launcher: calling destroyManager\n"));
       
       em->destroyManager (dam.in ());
       
-      ACE_DEBUG ((LM_DEBUG, "*** simple_em_launcher: destroyManager completed.\n"));
+      ACE_DEBUG ((LM_INFO, "*** simple_em_launcher: destroyManager completed.\n"));
       
       orb->destroy ();
     }