ChangeLogTag: Thu Feb 5 14:40:18 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

8 files changed, 1089 insertions, 25 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 279ec437b92..79e4710ea0a 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,9 +1,21 @@
-Thu Feb  5 00:39:48 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+Thu Feb  5 14:40:18 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp:
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl:
+        * tools/Config_Handlers/ERE_Handler.cpp:
         
-          Fixed a segmentation fault. 
+          Fixes to enable external reference connections for non-provider connections. 
         
+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:
@@ -11,9 +23,9 @@ Thu Feb  5 00:39:48 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
         * 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. 
-        
+
+          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:
diff --git a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index b8ef873ccad..e1f9c715a50 100644
--- a/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/flat/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -1603,7 +1603,10 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe
 
       for (unsigned int i = 0; i < providedReference.length(); ++i)
         {
-          //DANCE_DEBUG((LM_DEBUG, "[%M] NodeApplication_impl::finishLaunch - loop on all connections iteration %d for connection %C\n", i, providedReference[i].name.in()));
+          /*DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - "
+                       "loop on all connections iteration %d for connection %C\n", 
+                       i, 
+                       providedReference[i].name.in()));*/
 
           if (name.compare (providedReference[i].name.in()) == 0)
             {
@@ -1681,7 +1684,8 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe
                         if (CORBA::is_nil (ext_inst.in()))
                           {
                             DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - "
-                                         "facet for %C can't be narrowed \n", name.c_str ()));
+                                         "reference for %C can't be narrowed \n", name.c_str ()));
+                            throw ::Deployment::InvalidConnection();
                             break;
                           }
                         try
@@ -1884,9 +1888,9 @@ NodeApplication_Impl::connect_emitter_ext (Components::CCMObject_ptr inst,
   try
     {
       DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - "
-                   "connect_consumer for %C started\n", port_name.c_str()));
+                   "connect_emitter_ext for %C started\n", port_name.c_str()));
       inst->connect_consumer (port_name.c_str(), event);
-      DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - connect_consumer finished\n"));
+      DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - connect_emitter_ext finished\n"));
     }
   catch (const ::Components::AlreadyConnected& )
     {
@@ -1912,7 +1916,7 @@ NodeApplication_Impl::connect_publisher (Components::CCMObject_ptr inst,
   if (CORBA::is_nil (inst))
     {
       DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::connect_publisher - "
-        "Provided a nil CCMObject reference while connecting port %C\n",
+                    "Provided a nil CCMObject reference while connecting port %C\n",
 		    port_name.c_str ()));
       throw ::Deployment::InvalidConnection ();
     }
diff --git a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp
new file mode 100644
index 00000000000..6c01f6d36d6
--- /dev/null
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/EmitsConnectionExplicitHome_NS.cdp
@@ -0,0 +1,238 @@
+<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>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleEmitterComponent</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>true</provider>
+      <kind>EventConsumer</kind>
+      <instance xmi:idref="SimpleConsumerComponentInstance" />
+    </internalEndpoint>
+    <externalReference>
+      <location>corbaname:rir:/NameService#SimpleEmitterComponent</location>
+      <provider>false</provider>
+      <portName>hello</portName>
+      <supportedType>Meaningless</supportedType>
+    </externalReference>
+  </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_NS.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp
new file mode 100644
index 00000000000..dc865e8d0a3
--- /dev/null
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp
@@ -0,0 +1,286 @@
+<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>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleMultipleUserComponent</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>
+    <externalReference>
+      <location>corbaname:rir:/NameService#SimpleMultipleUserComponent</location>
+      <provider>false</provider>
+      <portName>trig</portName>
+      <supportedType>Meaningless</supportedType>
+    </externalReference>
+<!--    <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>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="SimpleProviderComponentInstance" />
+    </internalEndpoint>
+    <externalReference>
+      <location>corbaname:rir:/NameService#SimpleMultipleUserComponent</location>
+      <provider>false</provider>
+      <portName>trig</portName>
+      <supportedType>Meaningless</supportedType>
+    </externalReference>
+<!--
+    <internalEndpoint>
+      <portName>trig</portName>
+      <provider>false</provider>
+      <kind>MultiplexReceptacle</kind>
+      <instance xmi:idref="SimpleMultipleUserComponentInstanceReverse" />
+    </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_NS.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp
new file mode 100644
index 00000000000..054e7964bea
--- /dev/null
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/PublishConnectionExplicitHome_NS.cdp
@@ -0,0 +1,244 @@
+<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>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimplePublisherComponentInstance</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>
+    <externalReference>
+      <location>corbaname:rir:/NameService#SimplePublisherComponentInstance</location>
+      <provider>false</provider>
+      <portName>hello</portName>
+      <supportedType>Meaningless</supportedType>
+    </externalReference>
+  </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/SimplexConnectionExplicitHome_NS.cdp b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp
new file mode 100644
index 00000000000..c60ad818d6f
--- /dev/null
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp
@@ -0,0 +1,279 @@
+<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>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>SimpleUserComponent</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>-->
+    <externalReference>
+      <location>corbaname:rir:/NameService#SimpleUserComponent</location>
+      <provider>false</provider>
+      <portName>trig</portName>
+      <supportedType>Meaningless</supportedType>
+    </externalReference>
+  </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
index e69442ce9d2..b357e74d537 100755
--- a/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
+++ b/flat/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
@@ -92,9 +92,16 @@ sub run_node_daemons {
   return 0;
 }
 
-opendir(DIR, ".");
-@files = grep(/\.cdp$/,readdir(DIR));
-closedir(DIR);
+print "$#ARGV";
+
+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";
diff --git a/flat/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/flat/CIAO/tools/Config_Handlers/ERE_Handler.cpp
index ba16cd23e81..8a8a8f31666 100644
--- a/flat/CIAO/tools/Config_Handlers/ERE_Handler.cpp
+++ b/flat/CIAO/tools/Config_Handlers/ERE_Handler.cpp
@@ -25,7 +25,7 @@ namespace CIAO
            ++erep_b)
         {
           ERE_Handler::handle_external_ref_endpoint ((*erep_b),
-                                              dest[pos++]);
+                                                     dest[pos++]);
         }
     }
 
@@ -35,20 +35,14 @@ namespace CIAO
                                         Deployment::ExternalReferenceEndpoint &dest)
     {
       CIAO_TRACE("ERE_Handler::external_ref_endpoint");
-      dest.location =
-        src.location ().c_str ();
-      
-      dest.provider = 
-        src.provider ();
-      
-      dest.portName = 
-        src.portName ().c_str ();
-      
+      dest.location = src.location ().c_str ();
+      dest.provider = src.provider ();
+      if (src.portName_p ())
+        dest.portName = src.portName ().c_str ();
       dest.supportedType.length (src.count_supportedType ());
       std::for_each (src.begin_supportedType (),
                      src.end_supportedType (),
                      String_Seq_Functor (dest.supportedType));
-
     }
 
     ExternalReferenceEndpoint