Wed Nov 12 19:53:23 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu>

70 files changed, 280 insertions, 3 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 654f4e6eae2..9de64eae56a 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,9 +1,24 @@
-Wed Nov 12 19:35:47 UTC 2008  William R. Otte  <wotte@dre.vanderbilt.edu>
+Wed Nov 12 19:53:23 UTC 2008  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * DAnCE/NodeApplication/ComponentAttributesSetter.cpp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments:
+
+          Destination for EM included tests. 
         
-          Improved exception handling. 
+        * DAnCE/tests/CIAO/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp:
+
+          Test verifying multiplex facet connections. 
+        
+        * DAnCE/tests/CIAO/NodeManager-Deployments/Components:
+        * DAnCE/tests/CIAO/Components:
         
+           Moved components directory up one level. 
+
+Wed Nov 12 19:35:47 UTC 2008  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/NodeApplication/ComponentAttributesSetter.cpp:
+
+          Improved exception handling.
+
 Wed Nov 12 19:30:30 UTC 2008  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/NodeApplication/ComponentAttributesSetter.h:
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute.cidl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.cidl
index fe2ff8f2859..fe2ff8f2859 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute.cidl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.cidl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute.idl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.idl
index 7d41978b4de..7d41978b4de 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute.idl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.idl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute.mpc b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
index 6f552eaee25..6f552eaee25 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute.mpc
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_exec.cpp b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp
index 675e7dcc386..675e7dcc386 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_exec.cpp
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_exec.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h
index 2913eeb8d07..2913eeb8d07 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_exec.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_exec_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec_export.h
index 1b9481804a3..1b9481804a3 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_exec_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_stub_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_stub_export.h
index 00e32efd226..00e32efd226 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_stub_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_stub_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_svnt_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_svnt_export.h
index 6c1f3cf5a6f..6c1f3cf5a6f 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleAttribute_svnt_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_svnt_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon.idl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.idl
index 6f943e9d1d5..6f943e9d1d5 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon.idl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.idl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon.mpc b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.mpc
index b1f86554639..b1f86554639 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon.mpc
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon.mpc
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon_stub_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon_stub_export.h
index 79aac6677b7..79aac6677b7 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon_stub_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon_stub_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon_svnt_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon_svnt_export.h
index 0190bfeebab..0190bfeebab 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleCommon_svnt_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleCommon_svnt_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.cidl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.cidl
index ff5081f82dd..ff5081f82dd 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.cidl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.cidl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.idl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.idl
index 3895eacda3c..3895eacda3c 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.idl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.idl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.mpc b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
index bece676d798..bece676d798 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer.mpc
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.cpp b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp
index a5d6d4e7b24..a5d6d4e7b24 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.cpp
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h
index e4b9607bb45..e4b9607bb45 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec_export.h
index a8074c4c81f..a8074c4c81f 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_exec_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_stub_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_stub_export.h
index 89e5e37b32e..89e5e37b32e 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_stub_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_stub_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_svnt_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_svnt_export.h
index eab50bcfd0a..eab50bcfd0a 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleConsumer_svnt_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_svnt_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.cidl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.cidl
index 9de9153b267..9de9153b267 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.cidl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.cidl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.idl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.idl
index 37431ca8134..37431ca8134 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.idl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.idl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.mpc b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
index 6a68a0a5376..6a68a0a5376 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter.mpc
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.cpp b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp
index 99a3d01f161..99a3d01f161 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.cpp
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h
index a5008a85ea5..a5008a85ea5 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec_export.h
index 53fef48b799..53fef48b799 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_exec_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_stub_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_stub_export.h
index 797140271a4..797140271a4 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_stub_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_stub_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_svnt_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_svnt_export.h
index 0fdc781a895..0fdc781a895 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleEmitter_svnt_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_svnt_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.cidl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.cidl
index 638efe0cb30..638efe0cb30 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.cidl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.cidl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.idl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.idl
index 60aec58f9af..60aec58f9af 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.idl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.idl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.mpc b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
index 841ba3c2c99..841ba3c2c99 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser.mpc
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.cpp b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp
index 9fedb6b4bff..9fedb6b4bff 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.cpp
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h
index 180cce92554..180cce92554 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec_export.h
index 79cec9f8fe7..79cec9f8fe7 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_exec_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_stub_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_stub_export.h
index bf0be40ece3..bf0be40ece3 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_stub_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_stub_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_svnt_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_svnt_export.h
index 97f0fdf0f00..97f0fdf0f00 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleMultipleUser_svnt_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_svnt_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.cidl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.cidl
index 8c10398272a..8c10398272a 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.cidl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.cidl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.idl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.idl
index d8f02901be4..d8f02901be4 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.idl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.idl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.mpc b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc
index 3e64dd78d9b..3e64dd78d9b 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull.mpc
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.cpp b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp
index 449981e53ec..449981e53ec 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.cpp
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.h
index 00771543fb3..00771543fb3 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec_export.h
index 5d0ff473419..5d0ff473419 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_exec_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_stub_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_stub_export.h
index 17eef930019..17eef930019 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_stub_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_stub_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_svnt_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_svnt_export.h
index 9afa614f9a4..9afa614f9a4 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleNull_svnt_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_svnt_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.cidl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.cidl
index cff76c14b89..cff76c14b89 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.cidl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.cidl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.idl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.idl
index 97e2c80984b..97e2c80984b 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.idl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.idl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.mpc b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
index c917d235490..c917d235490 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider.mpc
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.cpp b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp
index 8271afe1faa..8271afe1faa 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.cpp
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h
index 044c9aa56e3..044c9aa56e3 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec_export.h
index c5e9182f61f..c5e9182f61f 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_exec_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_stub_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_stub_export.h
index 795f3fec902..795f3fec902 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_stub_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_stub_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_svnt_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_svnt_export.h
index 5f6be2501b6..5f6be2501b6 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleProvider_svnt_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_svnt_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.cidl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.cidl
index d5bae5c32ee..d5bae5c32ee 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.cidl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.cidl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.idl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.idl
index cee261fd15a..cee261fd15a 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.idl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.idl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.mpc b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc
index 232a4d462be..232a4d462be 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher.mpc
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.cpp b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp
index d15ab0ce667..d15ab0ce667 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.cpp
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.h
index b25191f0a4a..b25191f0a4a 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec_export.h
index 2f18677399f..2f18677399f 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_exec_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_stub_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_stub_export.h
index 8ab3300c5ca..8ab3300c5ca 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_stub_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_stub_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_svnt_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_svnt_export.h
index cbc5f4e56be..cbc5f4e56be 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimplePublisher_svnt_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_svnt_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.cidl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.cidl
index e3afe5e12f6..e3afe5e12f6 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.cidl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.cidl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.idl b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.idl
index 90d4e67e542..90d4e67e542 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.idl
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.idl
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.mpc b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc
index c33c4120a77..c33c4120a77 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser.mpc
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.cpp b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp
index 03d8eb16527..03d8eb16527 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.cpp
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.h
index 9b28f1e36f2..9b28f1e36f2 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec_export.h
index fcc935919a3..fcc935919a3 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_exec_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_stub_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_stub_export.h
index a31d19d5614..a31d19d5614 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_stub_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_stub_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_svnt_export.h b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_svnt_export.h
index 897f82c3081..897f82c3081 100644
--- a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/Components/SimpleUser_svnt_export.h
+++ b/flat/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_svnt_export.h
diff --git a/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp b/flat/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/MultiplexConnectionExplicitHome.cdp
new file mode 100644
index 00000000000..45ff31929c3
--- /dev/null
+++ b/flat/CIAO/DAnCE/tests/CIAO/NodeManager-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>Node</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleProviderHomeImplementation" />
+  </instance>
+
+  <instance xmi:id="SimpleProviderComponentInstance">
+    <name>SimpleProviderComponent</name>
+    <node>Node</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>Node</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="SimpleMultipleUserHomeImplementation" />
+  </instance>
+
+  <instance xmi:id="SimpleMultipleUserComponentInstance">
+    <name>SimpleMultipleUserComponent</name>
+    <node>Node</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>Node</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>